AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: remove unused matrixType param from ctx->Driver.UniformMatrix() functions

Browse Source
This commit is contained in:
Brian Paul
2009-04-14 20:00:28 -06:00
parent 62c45ec951
commit 0115a4f8f1
3 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/dd.h
+1 -1
View File
@@ -911,7 +911,7 @@ struct dd_function_table {
void (*Uniform)(GLcontext *ctx, GLint location, GLsizei count,
const GLvoid *values, GLenum type);
void (*UniformMatrix)(GLcontext *ctx, GLint cols, GLint rows,
GLenum matrixType, GLint location, GLsizei count,
GLint location, GLsizei count,
GLboolean transpose, const GLfloat *values);
void (*UseProgram)(GLcontext *ctx, GLuint program);
void (*ValidateProgram)(GLcontext *ctx, GLuint program);
src/mesa/main/shaders.c
+9 -18
View File
@@ -638,8 +638,7 @@ _mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
ctx->Driver.UniformMatrix(ctx, 2, 2, GL_FLOAT_MAT2,
location, count, transpose, value);
ctx->Driver.UniformMatrix(ctx, 2, 2, location, count, transpose, value);
}
void GLAPIENTRY
@@ -647,8 +646,7 @@ _mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
ctx->Driver.UniformMatrix(ctx, 3, 3, GL_FLOAT_MAT3,
location, count, transpose, value);
ctx->Driver.UniformMatrix(ctx, 3, 3, location, count, transpose, value);
}
void GLAPIENTRY
@@ -656,8 +654,7 @@ _mesa_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose,
const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
ctx->Driver.UniformMatrix(ctx, 4, 4, GL_FLOAT_MAT4,
location, count, transpose, value);
ctx->Driver.UniformMatrix(ctx, 4, 4, location, count, transpose, value);
}
@@ -669,8 +666,7 @@ _mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat *value)
{
GET_CURRENT_CONTEXT(ctx);
ctx->Driver.UniformMatrix(ctx, 2, 3, GL_FLOAT_MAT2x3,
location, count, transpose, value);
ctx->Driver.UniformMatrix(ctx, 2, 3, location, count, transpose, value);
}
void GLAPIENTRY
@@ -678,8 +674,7 @@ _mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat *value)
{
GET_CURRENT_CONTEXT(ctx);
ctx->Driver.UniformMatrix(ctx, 3, 2, GL_FLOAT_MAT3x2,
location, count, transpose, value);
ctx->Driver.UniformMatrix(ctx, 3, 2, location, count, transpose, value);
}
void GLAPIENTRY
@@ -687,8 +682,7 @@ _mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat *value)
{
GET_CURRENT_CONTEXT(ctx);
ctx->Driver.UniformMatrix(ctx, 2, 4, GL_FLOAT_MAT2x4,
location, count, transpose, value);
ctx->Driver.UniformMatrix(ctx, 2, 4, location, count, transpose, value);
}
void GLAPIENTRY
@@ -696,8 +690,7 @@ _mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat *value)
{
GET_CURRENT_CONTEXT(ctx);
ctx->Driver.UniformMatrix(ctx, 4, 2, GL_FLOAT_MAT4x2,
location, count, transpose, value);
ctx->Driver.UniformMatrix(ctx, 4, 2, location, count, transpose, value);
}
void GLAPIENTRY
@@ -705,8 +698,7 @@ _mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat *value)
{
GET_CURRENT_CONTEXT(ctx);
ctx->Driver.UniformMatrix(ctx, 3, 4, GL_FLOAT_MAT3x4,
location, count, transpose, value);
ctx->Driver.UniformMatrix(ctx, 3, 4, location, count, transpose, value);
}
void GLAPIENTRY
@@ -714,8 +706,7 @@ _mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat *value)
{
GET_CURRENT_CONTEXT(ctx);
ctx->Driver.UniformMatrix(ctx, 4, 3, GL_FLOAT_MAT4x3,
location, count, transpose, value);
ctx->Driver.UniformMatrix(ctx, 4, 3, location, count, transpose, value);
}
src/mesa/shader/shader_api.c
+1 -1
View File
@@ -1897,7 +1897,7 @@ set_program_uniform_matrix(GLcontext *ctx, struct gl_program *program,
*/
static void
_mesa_uniform_matrix(GLcontext *ctx, GLint cols, GLint rows,
GLenum matrixType, GLint location, GLsizei count,
GLint location, GLsizei count,
GLboolean transpose, const GLfloat *values)
{
struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;