Re: [Mesa-dev] [PATCH 10/10] mesa: Uniform logging is very, very unlikely

2014-11-18 Thread Anuj Phogat
On Mon, Nov 3, 2014 at 4:23 PM, Ian Romanick  wrote:
> From: Ian Romanick 
>
> Signed-off-by: Ian Romanick 
> ---
>  src/mesa/main/uniform_query.cpp | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
> index f971ba1..32870d0 100644
> --- a/src/mesa/main/uniform_query.cpp
> +++ b/src/mesa/main/uniform_query.cpp
> @@ -634,7 +634,7 @@ _mesa_uniform(struct gl_context *ctx, struct 
> gl_shader_program *shProg,
>return;
> }
>
> -   if (ctx->_Shader->Flags & GLSL_UNIFORMS) {
> +   if (unlikely(ctx->_Shader->Flags & GLSL_UNIFORMS)) {
>log_uniform(values, basicType, components, 1, count,
>   false, shProg, location, uni);
> }
> @@ -846,7 +846,7 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct 
> gl_shader_program *shProg,
>}
> }
>
> -   if (ctx->_Shader->Flags & GLSL_UNIFORMS) {
> +   if (unlikely(ctx->_Shader->Flags & GLSL_UNIFORMS)) {
>log_uniform(values, GLSL_TYPE_FLOAT, components, vectors, count,
>   bool(transpose), shProg, location, uni);
> }
> --
> 1.8.1.4
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Series is Reviewed-by: Anuj Phogat 
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH 10/10] mesa: Uniform logging is very, very unlikely

2014-11-03 Thread Ian Romanick
From: Ian Romanick 

Signed-off-by: Ian Romanick 
---
 src/mesa/main/uniform_query.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index f971ba1..32870d0 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -634,7 +634,7 @@ _mesa_uniform(struct gl_context *ctx, struct 
gl_shader_program *shProg,
   return;
}
 
-   if (ctx->_Shader->Flags & GLSL_UNIFORMS) {
+   if (unlikely(ctx->_Shader->Flags & GLSL_UNIFORMS)) {
   log_uniform(values, basicType, components, 1, count,
  false, shProg, location, uni);
}
@@ -846,7 +846,7 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct 
gl_shader_program *shProg,
   }
}
 
-   if (ctx->_Shader->Flags & GLSL_UNIFORMS) {
+   if (unlikely(ctx->_Shader->Flags & GLSL_UNIFORMS)) {
   log_uniform(values, GLSL_TYPE_FLOAT, components, vectors, count,
  bool(transpose), shProg, location, uni);
}
-- 
1.8.1.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev