aboutsummaryrefslogtreecommitdiff
path: root/util/fbcompose/plugins/opengl/preview/PreviewPlugin.cc
diff options
context:
space:
mode:
authorPaul Tagliamonte <paultag@fluxbox.org>2011-12-08 14:50:56 (GMT)
committerPaul Tagliamonte <paultag@fluxbox.org>2011-12-08 14:51:41 (GMT)
commit1311440217ca494aa2201f405745eb804a7f3112 (patch)
treeb50753ed1e30b23ab14e9e00b479fe8309bb4df7 /util/fbcompose/plugins/opengl/preview/PreviewPlugin.cc
parentd619086b577c7b2a50db00a8cb3dd79a6d33d86b (diff)
downloadfluxbox_paul-1311440217ca494aa2201f405745eb804a7f3112.zip
fluxbox_paul-1311440217ca494aa2201f405745eb804a7f3112.tar.bz2
Fixing up the branch to use some of the changes that were made since the fork.
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.cc3
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;