summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-11-04 20:07:51 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-11-04 20:07:51 (GMT)
commit6615fbca035397a41f09841858c6c2458a9cbdf9 (patch)
treee6f49c06a696cffca04236428d0ff711ac2b0c8d /src
parent85c638bf7168aeb222724761a55324fa70d1718d (diff)
downloadpowder-6615fbca035397a41f09841858c6c2458a9cbdf9.zip
powder-6615fbca035397a41f09841858c6c2458a9cbdf9.tar.gz
Fix shader compilation for ATi and Intel
Diffstat (limited to 'src')
-rw-r--r--src/graphics.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/graphics.c b/src/graphics.c
index 8f5fe8c..2409b98 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -2515,6 +2515,7 @@ void render_parts(pixel *vid)
glEnable( GL_TEXTURE_2D );
if(cmode==CM_FANCY)
{
+ float xres = XRES, yres = YRES;
glUseProgram(lensProg);
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, partsFboTex);
@@ -2528,8 +2529,8 @@ void render_parts(pixel *vid)
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, XRES, YRES, GL_GREEN, GL_FLOAT, gravyf);
glUniform1i(glGetUniformLocation(lensProg, "tfY"), 2);
glActiveTexture(GL_TEXTURE0);
- //glUniform1f(glGetUniformLocation(lensProg, "xres"), (float)XRES);
- //glUniform1f(glGetUniformLocation(lensProg, "yres"), (float)YRES);
+ glUniform1fv(glGetUniformLocation(lensProg, "xres"), 1, &xres);
+ glUniform1fv(glGetUniformLocation(lensProg, "yres"), 1, &yres);
}
else
{