mrq/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor function call reduction.

Browse Source
This commit is contained in:
Hayden K 2019-04-22 19:06:57 -04:00
parent 11a8736198
commit e03a651d10
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
GL/draw.c
View File

@ -349,7 +349,7 @@ static void _fillWithNegZVE(GLuint count, GLfloat* output) {
} }
} }
static void _fillWhiteARGB(GLuint count, GLubyte* output) { static inline void _fillWhiteARGB(GLuint count, GLubyte* output) {
ITERATE(count) { ITERATE(count) {
output[R8IDX] = 255; output[R8IDX] = 255;
output[G8IDX] = 255; output[G8IDX] = 255;
@ -696,11 +696,6 @@ static inline void _readNormalData(const GLuint first, const GLuint count, Verte
} }
static inline void _readDiffuseData(const GLuint first, const GLuint count, Vertex* output) { static inline void _readDiffuseData(const GLuint first, const GLuint count, Vertex* output) {
if((ENABLED_VERTEX_ATTRIBUTES & DIFFUSE_ENABLED_FLAG) != DIFFUSE_ENABLED_FLAG) {
/* Just fill the whole thing white if the attribute is disabled */
_fillWhiteARGB(count, output[0].bgra);
return;
}
const GLubyte cstride = (DIFFUSE_POINTER.stride) ? DIFFUSE_POINTER.stride : DIFFUSE_POINTER.size * byte_size(DIFFUSE_POINTER.type); const GLubyte cstride = (DIFFUSE_POINTER.stride) ? DIFFUSE_POINTER.stride : DIFFUSE_POINTER.size * byte_size(DIFFUSE_POINTER.type);
const void* cptr = ((GLubyte*) DIFFUSE_POINTER.ptr + (first * cstride)); const void* cptr = ((GLubyte*) DIFFUSE_POINTER.ptr + (first * cstride));
@ -765,7 +760,12 @@ static void generate(SubmissionTarget* target, const GLenum mode, const GLsizei
_readPositionData(first, count, start); _readPositionData(first, count, start);
profiler_checkpoint("positions"); profiler_checkpoint("positions");
_readDiffuseData(first, count, start); if((ENABLED_VERTEX_ATTRIBUTES & DIFFUSE_ENABLED_FLAG) != DIFFUSE_ENABLED_FLAG) {
/* Just fill the whole thing white if the attribute is disabled */
_fillWhiteARGB(count, start[0].bgra);
} else {
_readDiffuseData(first, count, start);
}
profiler_checkpoint("diffuse"); profiler_checkpoint("diffuse");
if(doTexture) _readUVData(first, count, start); if(doTexture) _readUVData(first, count, start);
@ -925,9 +925,6 @@ static void mat_transform_normal3(const float* xyz, const float* xyzOut, const u
} }
static void light(SubmissionTarget* target) { static void light(SubmissionTarget* target) {
if(!_glIsLightingEnabled()) {
return;
}
typedef struct { typedef struct {
float xyz[3]; float xyz[3];
@ -1112,7 +1109,10 @@ static void submitVertices(GLenum mode, GLsizei first, GLuint count, GLenum type
profiler_checkpoint("generate"); profiler_checkpoint("generate");
light(target); extern GLboolean LIGHTING_ENABLED;
if(LIGHTING_ENABLED){
light(target);
}
profiler_checkpoint("light"); profiler_checkpoint("light");

2
GL/state.c
View File

@ -251,7 +251,7 @@ void _glUpdatePVRTextureContext(pvr_poly_cxt_t* context, GLshort textureUnit) {
} }
} }
static GLboolean LIGHTING_ENABLED = GL_FALSE; /*static */GLboolean LIGHTING_ENABLED = GL_FALSE;
static GLboolean LIGHT_ENABLED[MAX_LIGHTS]; static GLboolean LIGHT_ENABLED[MAX_LIGHTS];
GLboolean _glIsLightingEnabled() { GLboolean _glIsLightingEnabled() {