OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make use of count in _mesa_uniform_matrix

Browse Source
This commit is contained in:
Bruce Merry
2007-12-21 16:04:43 +02:00
committed by Brian
parent 239be839be
commit 3f948025db
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/mesa/shader/shader_api.c
View File

@@ -1278,6 +1278,7 @@ _mesa_uniform_matrix(GLcontext *ctx, GLint cols, GLint rows,
GLenum matrixType, GLint location, GLsizei count, GLenum matrixType, GLint location, GLsizei count,
GLboolean transpose, const GLfloat *values) GLboolean transpose, const GLfloat *values)
{ {
GLsizei maxCount, i;
struct gl_shader_program *shProg = ctx->Shader.CurrentProgram; struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
if (!shProg || !shProg->LinkStatus) { if (!shProg || !shProg->LinkStatus) {
_mesa_error(ctx, GL_INVALID_OPERATION, _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -1297,6 +1298,10 @@ _mesa_uniform_matrix(GLcontext *ctx, GLint cols, GLint rows,
_mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix"); _mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix");
return; return;
} }
if (count < 0) {
_mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix(count < 0)");
return;
}
FLUSH_VERTICES(ctx, _NEW_PROGRAM); FLUSH_VERTICES(ctx, _NEW_PROGRAM);
@@ -1305,23 +1310,30 @@ _mesa_uniform_matrix(GLcontext *ctx, GLint cols, GLint rows,
* the rows. * the rows.
*/ */
/* XXXX need to test 3x3 and 2x2 matrices... */ /* XXXX need to test 3x3 and 2x2 matrices... */
if (transpose) { maxCount = shProg->Uniforms->Parameters[location].Size / (4 * cols);
GLuint row, col; if (count > maxCount)
for (col = 0; col < cols; col++) { count = maxCount;
GLfloat *v = shProg->Uniforms->ParameterValues[location + col]; for (i = 0; i < count; i++) {
for (row = 0; row < rows; row++) { if (transpose) {
v[row] = values[row * cols + col]; GLuint row, col;
for (col = 0; col < cols; col++) {
GLfloat *v = shProg->Uniforms->ParameterValues[location + col];
for (row = 0; row < rows; row++) {
v[row] = values[row * cols + col];
}
} }
} }
} else {
else { GLuint row, col;
GLuint row, col; for (col = 0; col < cols; col++) {
for (col = 0; col < cols; col++) { GLfloat *v = shProg->Uniforms->ParameterValues[location + col];
GLfloat *v = shProg->Uniforms->ParameterValues[location + col]; for (row = 0; row < rows; row++) {
for (row = 0; row < rows; row++) { v[row] = values[col * rows + row];
v[row] = values[col * rows + row]; }
} }
} }
location += cols;
values += rows * cols;
} }
} }