Attempt to fix NV compilation issue.

This commit is contained in:
Ioannis Tsakpinis 2011-04-02 11:33:02 +00:00
parent 0b5b6cbcb4
commit eb3a31bcc9
2 changed files with 7 additions and 8 deletions

View file

@ -518,12 +518,9 @@ public class DemoFractal {
glDeleteBuffers(glIDs);
}
if ( useTextures )
glGenTextures(glIDs);
else
glGenBuffers(glIDs);
if ( useTextures ) {
glGenTextures(glIDs);
// Init textures
for ( int i = 0; i < slices; i++ ) {
glBindTexture(GL_TEXTURE_2D, glIDs.get(i));
@ -535,6 +532,8 @@ public class DemoFractal {
}
glBindTexture(GL_TEXTURE_2D, 0);
} else {
glGenBuffers(glIDs);
// setup one empty PBO per slice
for ( int i = 0; i < slices; i++ ) {
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, glIDs.get(i));

View file

@ -57,7 +57,7 @@ kernel void mandelbrot(
output[iy * width + ix] = 0;
#endif
} else {
varfloat alpha = (varfloat)iteration / maxIterations;
float alpha = (float)iteration / maxIterations;
int colorIndex = (int)(alpha * colorMapSize);
#ifdef USE_TEXTURE
// We could have changed colorMap to a texture + sampler, but the
@ -69,9 +69,9 @@ kernel void mandelbrot(
(c & 0xFF) >> 0,
(c & 0xFF00) >> 8,
(c & 0xFF0000) >> 16,
_255
255.0f
);
write_imagef(output, (int2)(ix, iy), oc / _255);
write_imagef(output, (int2)(ix, iy), oc / 255.0f);
#else
output[iy * width + ix] = colorMap[colorIndex];
#endif