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

Fix not working properly, defer matrix calculation until needed

Browse Source
This commit is contained in:
UnknownShadow200 2024-08-03 16:40:23 +10:00
parent 2f26574a44
commit d4fc57cab2
2 changed files with 23 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
GL/draw.c
View File

@ -946,35 +946,6 @@ static void light(SubmissionTarget* target) {
_glPerformLighting(vertex, ES, target->count); _glPerformLighting(vertex, ES, target->count);
} }
GL_FORCE_INLINE void divide(SubmissionTarget* target) {
TRACE();
/* Perform perspective divide on each vertex */
Vertex* vertex = _glSubmissionTargetStart(target);
const float h = GetVideoMode()->height;
ITERATE(target->count) {
const float f = MATH_Fast_Invert(vertex->w);
/* Convert to NDC and apply viewport */
vertex->xyz[0] = MATH_fmac(
VIEWPORT.hwidth, vertex->xyz[0] * f, VIEWPORT.x_plus_hwidth
);
vertex->xyz[1] = h - MATH_fmac(
VIEWPORT.hheight, vertex->xyz[1] * f, VIEWPORT.y_plus_hheight
);
/* Apply depth range */
vertex->xyz[2] = MAX(
1.0f - MATH_fmac(vertex->xyz[2] * f, 0.5f, 0.5f),
PVR_MIN_Z
);
++vertex;
}
}
GL_FORCE_INLINE int _calc_pvr_face_culling() { GL_FORCE_INLINE int _calc_pvr_face_culling() {
if(!_glIsCullingEnabled()) { if(!_glIsCullingEnabled()) {
return GPU_CULLING_SMALL; return GPU_CULLING_SMALL;

43
GL/matrix.c
View File

@ -16,9 +16,11 @@ GLfloat DEPTH_RANGE_MULTIPLIER_H = (0 + 1) / 2;
static Stack __attribute__((aligned(32))) MATRIX_STACKS[4]; // modelview, projection, texture static Stack __attribute__((aligned(32))) MATRIX_STACKS[4]; // modelview, projection, texture
static Matrix4x4 __attribute__((aligned(32))) NORMAL_MATRIX; static Matrix4x4 __attribute__((aligned(32))) NORMAL_MATRIX;
static Matrix4x4 __attribute__((aligned(32))) VIEWPORT_MATRIX; static Matrix4x4 __attribute__((aligned(32))) VIEWPORT_MATRIX;
static Matrix4x4 __attribute__((aligned(32))) PROJECTION_MATRIX;
static GLenum MATRIX_MODE = GL_MODELVIEW; static GLenum MATRIX_MODE = GL_MODELVIEW;
static GLubyte MATRIX_IDX = 0; static GLubyte MATRIX_IDX = 0;
static GLboolean NORMAL_DIRTY, PROJECTION_DIRTY;
static const Matrix4x4 __attribute__((aligned(32))) IDENTITY = { static const Matrix4x4 __attribute__((aligned(32))) IDENTITY = {
1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f,
@ -92,25 +94,24 @@ static void transpose(GLfloat* m) {
} }
/* When projection matrix changes, need to pre-multiply with viewport transform matrix */ /* When projection matrix changes, need to pre-multiply with viewport transform matrix */
static void OnProjectionChanged() { static void UpdateProjectionMatrix() {
PROJECTION_DIRTY = false;
UploadMatrix4x4(&VIEWPORT_MATRIX); UploadMatrix4x4(&VIEWPORT_MATRIX);
MultiplyMatrix4x4(stack_top(MATRIX_STACKS + (GL_PROJECTION & 0xF))); MultiplyMatrix4x4(stack_top(MATRIX_STACKS + (GL_PROJECTION & 0xF)));
DownloadMatrix4x4(stack_top(MATRIX_STACKS + (GL_PROJECTION & 0xF))); DownloadMatrix4x4(&PROJECTION_MATRIX);
} }
/* When modelview matrix changes, need to re-compute normal matrix */ /* When modelview matrix changes, need to re-compute normal matrix */
static void OnModelviewChanged() { static void UpdateNormalMatrix() {
NORMAL_DIRTY = false;
MEMCPY4(NORMAL_MATRIX, stack_top(MATRIX_STACKS + (GL_MODELVIEW & 0xF)), sizeof(Matrix4x4)); MEMCPY4(NORMAL_MATRIX, stack_top(MATRIX_STACKS + (GL_MODELVIEW & 0xF)), sizeof(Matrix4x4));
inverse((GLfloat*) NORMAL_MATRIX); inverse((GLfloat*) NORMAL_MATRIX);
transpose((GLfloat*) NORMAL_MATRIX); transpose((GLfloat*) NORMAL_MATRIX);
} }
static void OnMatrixChanged() { static void OnMatrixChanged() {
if(MATRIX_MODE == GL_MODELVIEW) { if(MATRIX_MODE == GL_MODELVIEW) NORMAL_DIRTY = true;
OnModelviewChanged(); if(MATRIX_MODE == GL_PROJECTION) PROJECTION_DIRTY = true;
} else if(MATRIX_MODE == GL_PROJECTION) {
OnProjectionChanged();
}
} }
@ -125,13 +126,12 @@ void APIENTRY glPushMatrix() {
void* ret = stack_push(MATRIX_STACKS + MATRIX_IDX, top); void* ret = stack_push(MATRIX_STACKS + MATRIX_IDX, top);
(void) ret; (void) ret;
assert(ret); assert(ret);
OnMatrixChanged();
} }
void APIENTRY glPopMatrix() { void APIENTRY glPopMatrix() {
stack_pop(MATRIX_STACKS + MATRIX_IDX); stack_pop(MATRIX_STACKS + MATRIX_IDX);
if(MATRIX_MODE == GL_MODELVIEW) { OnMatrixChanged();
OnModelviewChanged();
}
} }
void APIENTRY glLoadIdentity() { void APIENTRY glLoadIdentity() {
@ -356,14 +356,14 @@ void glMultTransposeMatrixf(const GLfloat *m) {
/* Set the GL viewport */ /* Set the GL viewport */
void APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height) { void APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height) {
VIEWPORT_MATRIX[0][0] = width * 0.5f; VIEWPORT_MATRIX[M0] = width * 0.5f;
VIEWPORT_MATRIX[1][1] = -height * 0.5f; VIEWPORT_MATRIX[M5] = height * -0.5f;
VIEWPORT_MATRIX[2][2] = 1.0f; VIEWPORT_MATRIX[M10] = 1.0f;
VIEWPORT_MATRIX[3][3] = 1.0f; VIEWPORT_MATRIX[M15] = 1.0f;
VIEWPORT_MATRIX[3][0] = x + width * 0.5f; VIEWPORT_MATRIX[M12] = x + width * 0.5f;
VIEWPORT_MATRIX[3][1] = GetVideoMode()->height - (y + height * 0.5f); VIEWPORT_MATRIX[M13] = GetVideoMode()->height - (y + height * 0.5f);
OnProjectionChanged(); PROJECTION_DIRTY = true;
} }
/* Set the depth range */ /* Set the depth range */
@ -455,14 +455,17 @@ void _glMatrixLoadModelView() {
} }
void _glMatrixLoadProjection() { void _glMatrixLoadProjection() {
UploadMatrix4x4((const Matrix4x4*) stack_top(MATRIX_STACKS + (GL_PROJECTION & 0xF))); if (PROJECTION_DIRTY) UpdateProjectionMatrix();
UploadMatrix4x4(&PROJECTION_MATRIX);
} }
void _glMatrixLoadModelViewProjection() { void _glMatrixLoadModelViewProjection() {
UploadMatrix4x4((const Matrix4x4*) stack_top(MATRIX_STACKS + (GL_PROJECTION & 0xF))); if (PROJECTION_DIRTY) UpdateProjectionMatrix();
UploadMatrix4x4(&PROJECTION_MATRIX);
MultiplyMatrix4x4((const Matrix4x4*) stack_top(MATRIX_STACKS + (GL_MODELVIEW & 0xF))); MultiplyMatrix4x4((const Matrix4x4*) stack_top(MATRIX_STACKS + (GL_MODELVIEW & 0xF)));
} }
void _glMatrixLoadNormal() { void _glMatrixLoadNormal() {
if (NORMAL_DIRTY) UpdateNormalMatrix();
UploadMatrix4x4((const Matrix4x4*) &NORMAL_MATRIX); UploadMatrix4x4((const Matrix4x4*) &NORMAL_MATRIX);
} }