Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more typos and issues on mac

Browse source
This commit is contained in:
Sam Gateau 2015-06-08 07:25:32 -07:00
parent 862d6abd79
commit 8a93db6f5a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/gpu/src/gpu/GLBackend.h
View file

@ -84,8 +84,8 @@ public:
GLuint _shader; GLuint _shader;
GLuint _program; GLuint _program;
GLuint _transformCameraSlot = -1; GLint _transformCameraSlot = -1;
GLuint _transformObjectSlot = -1; GLint _transformObjectSlot = -1;
#if (GPU_TRANSFORM_PROFILE == GPU_CORE) #if (GPU_TRANSFORM_PROFILE == GPU_CORE)
#else #else
@ -318,7 +318,7 @@ protected:
#if (GPU_TRANSFORM_PROFILE == GPU_CORE) #if (GPU_TRANSFORM_PROFILE == GPU_CORE)
#else #else
GLuint _program_transformCamera_viewInverse = -1; GLint _program_transformCamera_viewInverse = -1;
#endif #endif
State::Data _stateCache; State::Data _stateCache;

2
libraries/gpu/src/gpu/GLBackendPipeline.cpp
View file

@ -146,7 +146,7 @@ void GLBackend::updatePipeline() {
// If shader program needs the inverseView we need to provide it // If shader program needs the inverseView we need to provide it
// YES InverseView in the shade is called View on the Batch interface // YES InverseView in the shade is called View on the Batch interface
if (_pipeline._program_transformCamera_viewInverse >= 0) { if (_pipeline._program_transformCamera_viewInverse >= 0) {
glUniformMatrix4fv(_pipeline._program_transformCamera_viewInverse, 1, false, &_transform._view); glUniformMatrix4fv(_pipeline._program_transformCamera_viewInverse, 1, false, (const GLfloat*) &_transform._view);
} }
#endif #endif
} }