Merge pull request #217 from Orphis/master

Fix some warnings (mostly printf errors)
This commit is contained in:
Henrik Rydgård
2012-12-21 14:14:27 -08:00
8 changed files with 19 additions and 18 deletions
+3 -3
View File
@@ -44,11 +44,11 @@ extern u32 curTextureWidth;
extern u32 curTextureHeight;
GLES_GPU::GLES_GPU(int renderWidth, int renderHeight)
: interruptsEnabled_(true),
: interruptsEnabled_(true),
displayFramebufPtr_(0),
renderWidth_(renderWidth),
renderHeight_(renderHeight),
dlIdGenerator(1),
displayFramebufPtr_(0)
dlIdGenerator(1)
{
renderWidthFactor_ = (float)renderWidth / 480.0f;
renderHeightFactor_ = (float)renderHeight / 272.0f;
+1 -1
View File
@@ -316,7 +316,7 @@ char *GenerateVertexShader(int prim)
WRITE(p, " float dot%i = dot(normalize(toLight%i), worldnormal);\n", i, i);
if (poweredDiffuse) {
WRITE(p, " dot%i = pow(dot%i, u_matspecular.a);\n");
WRITE(p, " dot%i = pow(dot%i, u_matspecular.a);\n", i, i);
}
if (doLight[i] == LIGHT_DOTONLY)