diff options
author | Paul Tagliamonte <paultag@fluxbox.org> | 2011-12-10 16:43:24 (GMT) |
---|---|---|
committer | Paul Tagliamonte <paultag@fluxbox.org> | 2011-12-10 16:43:24 (GMT) |
commit | 5e75c312050185267b05388a3991b932b447a75f (patch) | |
tree | b7b39d55993e612f7bfb373a161f6f5cb4a1f81f /util/fbcompose/plugins/opengl/preview/PreviewPlugin.cc | |
parent | 596c283553fb2da7e9204621347462bb46b83c4d (diff) | |
download | fluxbox_paul-fluxbox-gsoc-2011-integration.zip fluxbox_paul-fluxbox-gsoc-2011-integration.tar.bz2 |
Fixing up the branch to use some of the changes that were made since the fork.fluxbox-gsoc-2011-integration
The operator "=" was ditched in favor of .reset(
because (I'm quoting here): "it was an accident waiting
to happen".
Well. It builds now.
Diffstat (limited to 'util/fbcompose/plugins/opengl/preview/PreviewPlugin.cc')
-rw-r--r-- | util/fbcompose/plugins/opengl/preview/PreviewPlugin.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/fbcompose/plugins/opengl/preview/PreviewPlugin.cc b/util/fbcompose/plugins/opengl/preview/PreviewPlugin.cc index 97faf34..6448f92 100644 --- a/util/fbcompose/plugins/opengl/preview/PreviewPlugin.cc +++ b/util/fbcompose/plugins/opengl/preview/PreviewPlugin.cc | |||
@@ -96,7 +96,8 @@ void PreviewPlugin::windowCreated(const BaseCompWindow &window) { | |||
96 | const OpenGLWindow &gl_window = dynamic_cast<const OpenGLWindow&>(window); | 96 | const OpenGLWindow &gl_window = dynamic_cast<const OpenGLWindow&>(window); |
97 | 97 | ||
98 | OpenGLRenderingJob job; | 98 | OpenGLRenderingJob job; |
99 | job.prim_pos_buffer = new OpenGLBuffer(openGLScreen(), GL_ARRAY_BUFFER); | 99 | job.prim_pos_buffer.reset( |
100 | new OpenGLBuffer(openGLScreen(), GL_ARRAY_BUFFER)); | ||
100 | job.main_tex_coord_buffer = openGLScreen().defaultTexCoordBuffer(); | 101 | job.main_tex_coord_buffer = openGLScreen().defaultTexCoordBuffer(); |
101 | job.shape_tex_coord_buffer = openGLScreen().defaultTexCoordBuffer(); | 102 | job.shape_tex_coord_buffer = openGLScreen().defaultTexCoordBuffer(); |
102 | job.alpha = PREVIEW_ALPHA / 255.0f; | 103 | job.alpha = PREVIEW_ALPHA / 255.0f; |