On Fri, Feb 6, 2015 at 2:50 AM, Pohjolainen, Topi <topi.pohjolai...@intel.com> wrote: > On Fri, Feb 06, 2015 at 09:18:35AM +0200, Ian Romanick wrote: >> On 02/06/2015 06:56 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) >> > v5: add transpose for double case (Ilia) >> > >> > Signed-off-by: Dave Airlie <airl...@redhat.com> >> > --- >> > src/mesa/main/uniform_query.cpp | 47 +++++++--- >> > 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, 229 insertions(+), 39 deletions(-) >> > >> > diff --git a/src/mesa/main/uniform_query.cpp >> > b/src/mesa/main/uniform_query.cpp >> > index d36f506..2dc272e 100644 >> > --- a/src/mesa/main/uniform_query.cpp >> > +++ b/src/mesa/main/uniform_query.cpp >> > @@ -469,6 +469,9 @@ log_uniform(const void *values, enum glsl_base_type >> > basicType, >> > case GLSL_TYPE_FLOAT: >> > printf("%g ", v[i].f); >> > break; >> > + case GLSL_TYPE_DOUBLE: > > This won't compile, GLSL_TYPE_DOUBLE is not introduced until > "glsl: Add double builtin type". There are some more occurences in the rest > of the patch. It looks to me we need to split this in two, one dealing with > core state handling (src/mesa/main/uniforms.c) and another updating the > compiler frontend, and moving the latter further in the series. >
Perhaps instead split that "add GLSL_TYPE_DOUBLE" patch back out? (*that*'s why it was so early in the series) -ilia _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev