diff options
| author | Chris Forbes <chrisf@ijw.co.nz> | 2015-05-06 14:43:34 +1200 |
|---|---|---|
| committer | Chris Forbes <chrisf@ijw.co.nz> | 2015-05-06 19:01:38 +1200 |
| commit | 0374159b0ce3c4634364ca5ab257e305765d4879 (patch) | |
| tree | 31e80d3f5d0d31c8fbb5c9ddd82033e8987de947 /src | |
| parent | 212f26bb6070d6a1ddb9513d32233614a993e1d4 (diff) | |
| download | external_mesa3d-0374159b0ce3c4634364ca5ab257e305765d4879.zip external_mesa3d-0374159b0ce3c4634364ca5ab257e305765d4879.tar.gz external_mesa3d-0374159b0ce3c4634364ca5ab257e305765d4879.tar.bz2 | |
i965/gen6: setup limits for ARB_viewport_array
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_defines.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 6c00f6c..fd7420a 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -598,8 +598,8 @@ brw_initialize_context_constants(struct brw_context *brw) ctx->Const.ShaderCompilerOptions[MESA_SHADER_COMPUTE].NirOptions = &nir_options; /* ARB_viewport_array */ - if (brw->gen >= 7 && ctx->API == API_OPENGL_CORE) { - ctx->Const.MaxViewports = GEN7_NUM_VIEWPORTS; + if (brw->gen >= 6 && ctx->API == API_OPENGL_CORE) { + ctx->Const.MaxViewports = GEN6_NUM_VIEWPORTS; ctx->Const.ViewportSubpixelBits = 0; /* Cast to float before negating because MaxViewportWidth is unsigned. diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h index 7b5dd45..83d7a35 100644 --- a/src/mesa/drivers/dri/i965/brw_defines.h +++ b/src/mesa/drivers/dri/i965/brw_defines.h @@ -1712,7 +1712,7 @@ enum brw_message_target { # define GEN6_CC_VIEWPORT_MODIFY (1 << 12) # define GEN6_SF_VIEWPORT_MODIFY (1 << 11) # define GEN6_CLIP_VIEWPORT_MODIFY (1 << 10) -# define GEN7_NUM_VIEWPORTS 16 +# define GEN6_NUM_VIEWPORTS 16 #define _3DSTATE_VIEWPORT_STATE_POINTERS_CC 0x7823 /* GEN7+ */ #define _3DSTATE_VIEWPORT_STATE_POINTERS_SF_CL 0x7821 /* GEN7+ */ |