Merge branch 'master' of github.com:bkaradzic/bgfx
This commit is contained in:
commit
15c5918e7c
@ -3817,7 +3817,15 @@ namespace bgfx { namespace gl
|
||||
{
|
||||
GL_CHECK(glGetProgramResourceName(m_id, GL_PROGRAM_INPUT, ii, maxLength + 1, &size, name) );
|
||||
GLenum typeProp[] = { GL_TYPE };
|
||||
GL_CHECK(glGetProgramResourceiv(m_id, GL_PROGRAM_INPUT, ii, BX_COUNTOF(typeProp), typeProp, 1, NULL, (GLint *)&type) );
|
||||
GL_CHECK(glGetProgramResourceiv(m_id
|
||||
, GL_PROGRAM_INPUT
|
||||
, ii
|
||||
, BX_COUNTOF(typeProp)
|
||||
, typeProp
|
||||
, 1
|
||||
, NULL
|
||||
, (GLint *)&type)
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -867,6 +867,10 @@ typedef uint64_t GLuint64;
|
||||
# define GL_DISPATCH_INDIRECT_BUFFER 0x90EE
|
||||
#endif // GL_DISPATCH_INDIRECT_BUFFER
|
||||
|
||||
#ifndef GL_MAX_NAME_LENGTH
|
||||
# define GL_MAX_NAME_LENGTH 0x92F6
|
||||
#endif // GL_MAX_NAME_LENGTH
|
||||
|
||||
#if BX_PLATFORM_NACL
|
||||
# include "glcontext_ppapi.h"
|
||||
#elif BX_PLATFORM_WINDOWS
|
||||
|
Loading…
Reference in New Issue
Block a user