diff options
| author | Iago Toral Quiroga <itoral@igalia.com> | 2015-07-01 09:51:25 +0200 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-08-03 09:40:50 -0700 |
| commit | 38fc4a91cd5c04fdd5921b8776f8e203513ab517 (patch) | |
| tree | 6ad861d305e8f0c48a68e5ec6387f2c08f6e3a50 /src | |
| parent | 418c004f802e63ca4e9f3456a46498d2fc543854 (diff) | |
| download | external_mesa3d-38fc4a91cd5c04fdd5921b8776f8e203513ab517.zip external_mesa3d-38fc4a91cd5c04fdd5921b8776f8e203513ab517.tar.gz external_mesa3d-38fc4a91cd5c04fdd5921b8776f8e203513ab517.tar.bz2 | |
i965/nir: Enable NIR-vec4 pass on geometry shaders
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_shader.cpp | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index 7c5095d..819e4f2 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -135,6 +135,10 @@ brw_compiler_create(void *mem_ctx, const struct brw_device_info *devinfo) compiler->glsl_compiler_options[MESA_SHADER_VERTEX].NirOptions = nir_options; } + if (brw_env_var_as_boolean("INTEL_USE_NIR", false)) { + compiler->glsl_compiler_options[MESA_SHADER_GEOMETRY].NirOptions = nir_options; + } + compiler->glsl_compiler_options[MESA_SHADER_FRAGMENT].NirOptions = nir_options; compiler->glsl_compiler_options[MESA_SHADER_COMPUTE].NirOptions = nir_options; diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index 6f6e627..8d83887 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -1721,7 +1721,7 @@ bool vec4_visitor::run(gl_clip_plane *clip_planes) { bool use_vec4_nir = - compiler->glsl_compiler_options[MESA_SHADER_VERTEX].NirOptions != NULL; + compiler->glsl_compiler_options[stage].NirOptions != NULL; sanity_param_count = prog->Parameters->NumParameters; |