Mesa (master): vc4: Drop VS inputs to 8.

Eric Anholt anholt at kemper.freedesktop.org
Fri Feb 10 22:18:03 UTC 2017


Module: Mesa
Branch: master
Commit: a0b68418383ecc0ee2ac475ff6dc1d28b4ae6e24
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a0b68418383ecc0ee2ac475ff6dc1d28b4ae6e24

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Feb 10 10:45:42 2017 -0800

vc4: Drop VS inputs to 8.

In the hardware we only get to declare 8 vertex elements (GLES2's
minimum), so we should be exposing that number here.  Fixes an assertion
failure in piglit texrect-many, at the expense of various GL 2.0-ish
minmax tests now complaining that our count is too low.

---

 src/gallium/drivers/vc4/vc4_screen.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c
index 5cc0b04..3b2c265 100644
--- a/src/gallium/drivers/vc4/vc4_screen.c
+++ b/src/gallium/drivers/vc4/vc4_screen.c
@@ -365,10 +365,7 @@ vc4_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
                 return vc4_screen(pscreen)->has_control_flow;
 
         case PIPE_SHADER_CAP_MAX_INPUTS:
-                if (shader == PIPE_SHADER_FRAGMENT)
-                        return 8;
-                else
-                        return 16;
+                return 8;
         case PIPE_SHADER_CAP_MAX_OUTPUTS:
                 return shader == PIPE_SHADER_FRAGMENT ? 1 : 8;
         case PIPE_SHADER_CAP_MAX_TEMPS:




More information about the mesa-commit mailing list