Attachment 13297 Details for Bug 13753 – Patch 4/5

[patch] Patch 4/5

0004-Make-use-of-count-in-_mesa_uniform_matrix.patch (text/plain), 2.70 KB, created by Bruce Merry on 2007-12-21 13:23:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bruce Merry

Created: 2007-12-21 13:23:13 UTC

Size: 2.70 KB

patch

obsolete

>From 7db481b55d92d8e847dddf7f23a837c9ea394ea3 Mon Sep 17 00:00:00 2001
>From: Bruce Merry <bmerry@users.sourceforge.net>
>Date: Fri, 21 Dec 2007 16:04:43 +0200
>Subject: [PATCH] Make use of count in _mesa_uniform_matrix
>
>---
> src/mesa/shader/shader_api.c |   38 +++++++++++++++++++++++++-------------
> 1 files changed, 25 insertions(+), 13 deletions(-)
>
>diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
>index 75fb918..a9e3e3a 100644
>--- a/src/mesa/shader/shader_api.c
>+++ b/src/mesa/shader/shader_api.c
>@@ -1278,6 +1278,7 @@ _mesa_uniform_matrix(GLcontext *ctx, GLint cols, GLint rows,
>                      GLenum matrixType, GLint location, GLsizei count,
>                      GLboolean transpose, const GLfloat *values)
> {
>+   GLsizei maxCount, i;
>    struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
>    if (!shProg || !shProg->LinkStatus) {
>       _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");
>       return;
>    }
>+   if (count < 0) {
>+      _mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix(count < 0)");
>+      return;
>+   }
> 
>    FLUSH_VERTICES(ctx, _NEW_PROGRAM);
> 
>@@ -1305,23 +1310,30 @@ _mesa_uniform_matrix(GLcontext *ctx, GLint cols, GLint rows,
>     * the rows.
>     */
>    /* XXXX need to test 3x3 and 2x2 matrices... */
>-   if (transpose) {
>-      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];
>+   maxCount = shProg->Uniforms->Parameters[location].Size / (4 * cols);
>+   if (count > maxCount)
>+      count = maxCount;
>+   for (i = 0; i < count; i++) {
>+      if (transpose) {
>+         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 {
>-      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[col * rows + row];
>+      else {
>+         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[col * rows + row];
>+            }
>          }
>       }
>+      location += cols;
>+      values += rows * cols;
>    }
> }
> 
>-- 
>1.5.2.5
>

Actions: View | Splinter Review

Attachments on bug 13753: 13294 | 13295 | 13296 | 13297 | 13298

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.