Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / drivers / nvfx / nvfx_screen.c

diff --git a/src/gallium/drivers/nvfx/nvfx_screen.c b/src/gallium/drivers/nvfx/nvfx_screen.c
index 708fc3807dc59723b3bc86945b07ddc917c7aba6..273fac76a9ff3296084ef82cbef14bd4bdd26753 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_screen.c
+++ b/src/gallium/drivers/nvfx/nvfx_screen.c
@@ -124,6 +124,8 @@ nvfx_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader, enum
                case PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR:
                case PIPE_SHADER_CAP_INDIRECT_CONST_ADDR:
                        return 0;
+               case PIPE_SHADER_CAP_SUBROUTINES:
+                       return screen->use_nv4x ? 1 : 0;
                default:
                        break;
                }
@@ -162,6 +164,8 @@ nvfx_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader, enum
                        return 0;
                case PIPE_SHADER_CAP_INDIRECT_CONST_ADDR:
                        return 1;
+               case PIPE_SHADER_CAP_SUBROUTINES:
+                       return 1;
                default:
                        break;
                }