summaryrefslogtreecommitdiffstats
path: root/demos/boxes
diff options
context:
space:
mode:
authorTrond Kjernåsen <trond@trolltech.com>2009-06-10 14:34:49 (GMT)
committerTrond Kjernåsen <trond@trolltech.com>2009-06-10 14:36:12 (GMT)
commit26792835b56261b0a0080ea010205a0b3134830c (patch)
tree94c84d1f044396aa6a133ba99756681533303cfa /demos/boxes
parentb0192e2cdf10313799cfda63d93361669e752645 (diff)
downloadQt-26792835b56261b0a0080ea010205a0b3134830c.zip
Qt-26792835b56261b0a0080ea010205a0b3134830c.tar.gz
Qt-26792835b56261b0a0080ea010205a0b3134830c.tar.bz2
Fixed a compile failure on Solaris, really :)
You can't static_cast from a signed to an unsigned type and vice versa. Reviewed-by: Kim
Diffstat (limited to 'demos/boxes')
-rw-r--r--demos/boxes/glshaders.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/demos/boxes/glshaders.cpp b/demos/boxes/glshaders.cpp
index 05bbf71..094fd77 100644
--- a/demos/boxes/glshaders.cpp
+++ b/demos/boxes/glshaders.cpp
@@ -58,7 +58,7 @@ GLShader::GLShader(const char *data, int size, GLenum shaderType)
m_shader = glCreateShaderObjectARB(shaderType);
GLint glSize = size;
- glShaderSourceARB(m_shader, 1, static_cast<const GLcharARB**>(&data), &glSize);
+ glShaderSourceARB(m_shader, 1, reinterpret_cast<const GLcharARB**>(&data), &glSize);
glCompileShaderARB(m_shader);
int status;
glGetObjectParameterivARB(m_shader, GL_OBJECT_COMPILE_STATUS_ARB, &status);
@@ -79,7 +79,7 @@ GLShader::GLShader(const QString& fileName, GLenum shaderType)
GLint size = file.size();
const char *p = bytes.data();
file.close();
- glShaderSourceARB(m_shader, 1, static_cast<const GLcharARB**>(&p), &size);
+ glShaderSourceARB(m_shader, 1, reinterpret_cast<const GLcharARB**>(&p), &size);
glCompileShaderARB(m_shader);
int status;
glGetObjectParameterivARB(m_shader, GL_OBJECT_COMPILE_STATUS_ARB, &status);
@@ -105,7 +105,7 @@ QString GLShader::log()
glGetObjectParameterivARB(m_shader, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
char *log = new char[length + 1];
GLsizei glLength = length;
- glGetInfoLogARB(m_shader, glLength, &glLength, static_cast<GLcharARB*>(log));
+ glGetInfoLogARB(m_shader, glLength, &glLength, reinterpret_cast<GLcharARB*>(log));
log[glLength] = '\0';
QString result(log);
delete log;
@@ -184,7 +184,7 @@ QString GLProgram::log()
glGetObjectParameterivARB(m_program, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
char *log = new char[length + 1];
GLsizei glLength = length;
- glGetInfoLogARB(m_program, glLength, &glLength, static_cast<GLcharARB*>(log));
+ glGetInfoLogARB(m_program, glLength, &glLength, reinterpret_cast<GLcharARB*>(log));
log[glLength] = '\0';
QString result(log);
delete log;
@@ -212,7 +212,7 @@ bool GLProgram::hasParameter(const QString& name)
if (!failed()) {
QByteArray asciiName = name.toAscii();
- return -1 != glGetUniformLocationARB(m_program, static_cast<const GLcharARB*>(asciiName.data()));
+ return -1 != glGetUniformLocationARB(m_program, reinterpret_cast<const GLcharARB*>(asciiName.data()));
}
return false;
}
@@ -223,7 +223,7 @@ void GLProgram::setInt(const QString& name, int value)
if (!failed()) {
QByteArray asciiName = name.toAscii();
- int loc = glGetUniformLocationARB(m_program, static_cast<const GLcharARB*>(asciiName.data()));
+ int loc = glGetUniformLocationARB(m_program, reinterpret_cast<const GLcharARB*>(asciiName.data()));
glUniform1iARB(loc, value);
}
}
@@ -234,7 +234,7 @@ void GLProgram::setFloat(const QString& name, float value)
if (!failed()) {
QByteArray asciiName = name.toAscii();
- int loc = glGetUniformLocationARB(m_program, static_cast<const GLcharARB*>(asciiName.data()));
+ int loc = glGetUniformLocationARB(m_program, reinterpret_cast<const GLcharARB*>(asciiName.data()));
glUniform1fARB(loc, value);
}
}
@@ -246,7 +246,7 @@ void GLProgram::setColor(const QString& name, QRgb value)
//qDebug() << "Setting color" << name;
if (!failed()) {
QByteArray asciiName = name.toAscii();
- int loc = glGetUniformLocationARB(m_program, static_cast<const GLcharARB*>(asciiName.data()));
+ int loc = glGetUniformLocationARB(m_program, reinterpret_cast<const GLcharARB*>(asciiName.data()));
//qDebug() << "Location of" << name << "is" << loc;
QColor color(value);
glUniform4fARB(loc, color.redF(), color.greenF(), color.blueF(), color.alphaF());
@@ -259,7 +259,7 @@ void GLProgram::setMatrix(const QString& name, const gfx::Matrix4x4f &mat)
if (!failed()) {
QByteArray asciiName = name.toAscii();
- int loc = glGetUniformLocationARB(m_program, static_cast<const GLcharARB*>(asciiName.data()));
+ int loc = glGetUniformLocationARB(m_program, reinterpret_cast<const GLcharARB*>(asciiName.data()));
//qDebug() << "Location of" << name << "is" << loc;
glUniformMatrix4fvARB(loc, 1, GL_FALSE, mat.bits());
}