archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Use ALsizei/GLsizei to fix compile errors on mac / gcc 4.x.

Browse Source
This commit is contained in:
Brecht Van Lommel
2006-01-29 21:29:14 +00:00
parent 48fc07716a
commit 24446906bc
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/SoundSystem/openal/SND_OpenALDevice.cpp
View File

@@ -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

10
source/gameengine/Ketsji/BL_Shader.cpp
View File

@@ -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);