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

Performance tweaks

Browse Source
This commit is contained in:
Luke Benstead 2020-05-08 19:42:31 +01:00
parent 1289a06279
commit aa20bb20b2
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
GL/draw.c
View File

@ -121,12 +121,7 @@ GL_FORCE_INLINE float clamp(float d, float min, float max) {
} }
static void _readVertexData3f3f(const GLubyte* in, GLubyte* out) { static void _readVertexData3f3f(const GLubyte* in, GLubyte* out) {
const float* input = (const float*) in; memcpy(out, in, sizeof(float) * 12);
float* output = (float*) out;
output[0] = input[0];
output[1] = input[1];
output[2] = input[2];
} }
// 10:10:10:2REV format // 10:10:10:2REV format
@ -182,11 +177,7 @@ static void _readVertexData3ub3f(const GLubyte* input, GLubyte* out) {
} }
static void _readVertexData2f2f(const GLubyte* in, GLubyte* out) { static void _readVertexData2f2f(const GLubyte* in, GLubyte* out) {
const float* input = (const float*) in; memcpy(out, in, sizeof(float) * 2);
float* output = (float*) out;
output[0] = input[0];
output[1] = input[1];
} }
static void _readVertexData2f3f(const GLubyte* in, GLubyte* out) { static void _readVertexData2f3f(const GLubyte* in, GLubyte* out) {

13
GL/lighting.c
View File

@ -404,8 +404,8 @@ GL_FORCE_INLINE void _glLightVertexDirectional(
#define _PROCESS_COMPONENT(T, X) \ #define _PROCESS_COMPONENT(T, X) \
do { \ do { \
float F = MATH_fmac(LdotN, LIGHTS[lid].diffuseMaterial[X], LIGHTS[lid].ambientMaterial[X]); \ float F = (LdotN * LIGHTS[lid].diffuseMaterial[X] + LIGHTS[lid].ambientMaterial[X]) \
F += (FI * LIGHTS[lid].specularMaterial[X]); \ + (FI * LIGHTS[lid].specularMaterial[X]); \
uint8_t FO = (uint8_t) (_MIN(F * 255.0f, 255.0f)); \ uint8_t FO = (uint8_t) (_MIN(F * 255.0f, 255.0f)); \
final[T] += _MIN(FO, 255 - final[T]); \ final[T] += _MIN(FO, 255 - final[T]); \
} while(0); } while(0);
@ -426,8 +426,8 @@ GL_FORCE_INLINE void _glLightVertexPoint(
#define _PROCESS_COMPONENT(T, X) \ #define _PROCESS_COMPONENT(T, X) \
do { \ do { \
float F = MATH_fmac(LdotN, LIGHTS[lid].diffuseMaterial[X], LIGHTS[lid].ambientMaterial[X]); \ float F = (LdotN * LIGHTS[lid].diffuseMaterial[X] + LIGHTS[lid].ambientMaterial[X]) \
F += (FI * LIGHTS[lid].specularMaterial[X]); \ + (FI * LIGHTS[lid].specularMaterial[X]); \
uint8_t FO = (uint8_t) (_MIN(F * att * 255.0f, 255.0f)); \ uint8_t FO = (uint8_t) (_MIN(F * att * 255.0f, 255.0f)); \
final[T] += _MIN(FO, 255 - final[T]); \ final[T] += _MIN(FO, 255 - final[T]); \
} while(0); \ } while(0); \
@ -460,9 +460,6 @@ void _glPerformLighting(Vertex* vertices, const EyeSpaceData* es, const int32_t
float vdiffuse[4]; float vdiffuse[4];
for(j = 0; j < count; ++j, ++vertex, ++data) { for(j = 0; j < count; ++j, ++vertex, ++data) {
__builtin_prefetch(vertex + 1, 1, 1);
__builtin_prefetch(data + 1, 0, 1);
/* Unpack the colour for use in glColorMaterial */ /* Unpack the colour for use in glColorMaterial */
bgra_to_float(vertex->bgra, vdiffuse); bgra_to_float(vertex->bgra, vdiffuse);
_glUpdateColourMaterial(vdiffuse); _glUpdateColourMaterial(vdiffuse);
@ -481,8 +478,6 @@ void _glPerformLighting(Vertex* vertices, const EyeSpaceData* es, const int32_t
const float Nz = data->n[2]; const float Nz = data->n[2];
for(i = 0; i < MAX_LIGHTS; ++i) { for(i = 0; i < MAX_LIGHTS; ++i) {
__builtin_prefetch(LIGHTS + i + 1, 0, 1);
if(!LIGHTS[i].isEnabled) continue; if(!LIGHTS[i].isEnabled) continue;
if(LIGHTS[i].isDirectional) { if(LIGHTS[i].isDirectional) {