[Mesa-dev] [PATCH] st/mesa: fix geometry shader max texture limit in state validation

2014-06-16 Thread Marek Olšák
---
 src/mesa/state_tracker/st_atom_texture.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_atom_texture.c 
b/src/mesa/state_tracker/st_atom_texture.c
index e2d26ee..f34a598 100644
--- a/src/mesa/state_tracker/st_atom_texture.c
+++ b/src/mesa/state_tracker/st_atom_texture.c
@@ -434,7 +434,7 @@ update_geometry_textures(struct st_context *st)
   update_textures(st,
   PIPE_SHADER_GEOMETRY,
   ctx-GeometryProgram._Current-Base,
-  
ctx-Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits,
+  
ctx-Const.Program[MESA_SHADER_GEOMETRY].MaxTextureImageUnits,
   st-state.sampler_views[PIPE_SHADER_GEOMETRY],
   st-state.num_sampler_views[PIPE_SHADER_GEOMETRY]);
}
-- 
1.9.1

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


Re: [Mesa-dev] [PATCH] st/mesa: fix geometry shader max texture limit in state validation

2014-06-16 Thread Brian Paul

On 06/16/2014 04:45 PM, Marek Olšák wrote:

---
  src/mesa/state_tracker/st_atom_texture.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_atom_texture.c 
b/src/mesa/state_tracker/st_atom_texture.c
index e2d26ee..f34a598 100644
--- a/src/mesa/state_tracker/st_atom_texture.c
+++ b/src/mesa/state_tracker/st_atom_texture.c
@@ -434,7 +434,7 @@ update_geometry_textures(struct st_context *st)
update_textures(st,
PIPE_SHADER_GEOMETRY,
ctx-GeometryProgram._Current-Base,
-  
ctx-Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits,
+  
ctx-Const.Program[MESA_SHADER_GEOMETRY].MaxTextureImageUnits,
st-state.sampler_views[PIPE_SHADER_GEOMETRY],
st-state.num_sampler_views[PIPE_SHADER_GEOMETRY]);
 }



Reviewed-by: Brian Paul bri...@vmware.com

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