diff options
| -rw-r--r-- | intern/SoundSystem/openal/SND_OpenALDevice.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/BL_Shader.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp index 98eed6bb104..399008b3b28 100644 --- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp +++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp @@ -404,7 +404,7 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name, ALenum al_error = alGetError(); #ifdef OUDE_OPENAL - unsigned int samplerate, numberofsamples; // openal_2.12 + ALsizei samplerate, numberofsamples; // openal_2.12 #else int samplerate, numberofsamples; // openal_2.14+ #endif diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp index 4c41101b462..f6aa8f625d6 100644 --- a/source/gameengine/Ketsji/BL_Shader.cpp +++ b/source/gameengine/Ketsji/BL_Shader.cpp @@ -92,8 +92,8 @@ bool BL_Shader::LinkProgram() { #ifdef GL_ARB_shader_objects - int vertlen = 0, fraglen=0, proglen=0; - int vertstatus=0, fragstatus=0, progstatus=0; + GLint vertlen = 0, fraglen=0, proglen=0; + GLint vertstatus=0, fragstatus=0, progstatus=0; unsigned int tmpVert=0, tmpFrag=0, tmpProg=0; int char_len=0; @@ -200,9 +200,11 @@ programError: void BL_Shader::PrintInfo(int len, unsigned int handle, int* num) { #ifdef GL_ARB_shader_objects + GLsizei number; mLog = (char*)MEM_mallocN(sizeof(char)*len, "print_log"); //MT_assert(mLog, "Failed to create memory"); - bgl::blGetInfoLogARB(handle, len, num, mLog); + bgl::blGetInfoLogARB(handle, len, &number, mLog); + *num = number; #endif//GL_ARB_shader_objects } @@ -400,7 +402,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, validate, "validate()") PyErr_Format(PyExc_TypeError, "invalid shader object"); return NULL; } - int stat = 0; + GLint stat = 0; bgl::blValidateProgramARB(mShader); bgl::blGetObjectParameterivARB(mShader, GL_OBJECT_VALIDATE_STATUS_ARB, &stat); return PyInt_FromLong(0); |