summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2010-04-03 08:51:07 +1000
committerRhys Weatherley <rhys.weatherley@nokia.com>2010-04-03 09:25:40 +1000
commit4606fd8abf865919b94d5645a2051dc9c92e2b09 (patch)
tree7a7df15680741486d10f8a146478bc7154bbba77 /demos
parent5ee66bb5c79ad8e0d065bb75d4263a51253a60b3 (diff)
Split the OpenGL dependencies out into a separate library.
Eventually we may want to put QtOpenCL into QtGui, so we cannot have any OpenGL dependencies in it.
Diffstat (limited to 'demos')
-rw-r--r--demos/mandelbrot/imagecl.cpp4
-rw-r--r--demos/mandelbrot/mandelbrot.pro2
2 files changed, 3 insertions, 3 deletions
diff --git a/demos/mandelbrot/imagecl.cpp b/demos/mandelbrot/imagecl.cpp
index ccd2f7c..64b9142 100644
--- a/demos/mandelbrot/imagecl.cpp
+++ b/demos/mandelbrot/imagecl.cpp
@@ -191,7 +191,7 @@ void ImageCL::generate(int maxIterations, const Palette &palette)
glFinish();
// Acquire the GL texture object.
- textureBuffer.acquireGL();
+ textureBuffer.acquire();
// Execute the "mandelbrot" kernel.
mandelbrot(textureBuffer, float(region.x()), float(region.y()),
@@ -200,7 +200,7 @@ void ImageCL::generate(int maxIterations, const Palette &palette)
// Release the GL texture object and wait for it complete.
// After the release is complete, the texture can be used by GL.
- textureBuffer.releaseGL();
+ textureBuffer.release();
}
}
diff --git a/demos/mandelbrot/mandelbrot.pro b/demos/mandelbrot/mandelbrot.pro
index 02acabb..b9946e8 100644
--- a/demos/mandelbrot/mandelbrot.pro
+++ b/demos/mandelbrot/mandelbrot.pro
@@ -28,4 +28,4 @@ HEADERS += palette.h \
RESOURCES += mandelbrot.qrc
LIBS += -L../../lib -L../../bin
-include(../../src/opencl/opencl_dep.pri)
+include(../../src/openclgl/openclgl_dep.pri)