On 02/05/2015 08:38 PM, Ilia Mirkin wrote:
On Thu, Feb 5, 2015 at 11:17 AM, Brian Paul <bri...@vmware.com> wrote:
On 02/05/2015 12:27 AM, Ilia Mirkin wrote:
From: Dave Airlie <airl...@redhat.com>
This adds support for the new uniform interfaces
from ARB_gpu_shader_fp64.
v2:
support ARB_separate_shader_objects ProgramUniform*d* (Ian)
don't allow boolean uniforms to be updated (issue 15) (Ian)
v3: fix size_mul
v4: Teach uniform update to take into account double precision (Topi)
Signed-off-by: Dave Airlie <airl...@redhat.com>
---
src/mesa/main/uniform_query.cpp | 27 +++---
src/mesa/main/uniforms.c | 185
++++++++++++++++++++++++++++++++++----
src/mesa/main/uniforms.h | 3 +-
src/mesa/program/ir_to_mesa.cpp | 17 +++-
src/mesa/program/prog_parameter.c | 16 ++--
5 files changed, 210 insertions(+), 38 deletions(-)
diff --git a/src/mesa/main/uniform_query.cpp
b/src/mesa/main/uniform_query.cpp
index d36f506..7db8c36 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -808,13 +810,14 @@ extern "C" void
_mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program
*shProg,
GLuint cols, GLuint rows,
GLint location, GLsizei count,
- GLboolean transpose, const GLfloat *values)
+ GLboolean transpose,
+ const GLvoid *values, GLenum type)
You can use void instead of GLvoid.
All the other params are GL* -- seems really inconsistent to switch
back and forth.
It's not a big deal. But the ARB is kind of deprecating GLvoid. If you
look at glext.h, there's only two remaining instances of GLvoid. void
is used everywhere else.
-Brian
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
