Module: Mesa Branch: master Commit: 44415056e7b5cb0137ccc843ab0a4c803d1a38c8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=44415056e7b5cb0137ccc843ab0a4c803d1a38c8
Author: Rafael Antognolli <rafael.antogno...@intel.com> Date: Tue Jun 13 16:46:19 2017 -0700 intel/genxml: Rename field on WM_STATE to match gen6+. "Pixel Shader Kill Pixel" -> "Pixel Shader Kills Pixel", which is how it's called on newer gens. Signed-off-by: Rafael Antognolli <rafael.antogno...@intel.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> --- src/intel/genxml/gen4.xml | 2 +- src/intel/genxml/gen45.xml | 2 +- src/intel/genxml/gen5.xml | 2 +- src/mesa/drivers/dri/i965/gen4_blorp_exec.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml index 33b487155e..f4ca3f09ec 100644 --- a/src/intel/genxml/gen4.xml +++ b/src/intel/genxml/gen4.xml @@ -789,7 +789,7 @@ <field name="Statistics Enable" start="128" end="128" type="bool"/> <field name="Maximum Number of Threads" start="185" end="191" type="uint"/> <field name="Legacy Diamond Line Rasterization" start="183" end="183" type="bool"/> - <field name="Pixel Shader Kill Pixel" start="182" end="182" type="bool"/> + <field name="Pixel Shader Kills Pixel" start="182" end="182" type="bool"/> <field name="Pixel Shader Computed Depth" start="181" end="181" type="bool"/> <field name="Pixel Shader Uses Source Depth" start="180" end="180" type="bool"/> <field name="Thread Dispatch Enable" start="179" end="179" type="bool"/> diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml index b708c4fc21..5c221b7843 100644 --- a/src/intel/genxml/gen45.xml +++ b/src/intel/genxml/gen45.xml @@ -804,7 +804,7 @@ <field name="Statistics Enable" start="128" end="128" type="bool"/> <field name="Maximum Number of Threads" start="185" end="191" type="uint"/> <field name="Legacy Diamond Line Rasterization" start="183" end="183" type="bool"/> - <field name="Pixel Shader Kill Pixel" start="182" end="182" type="bool"/> + <field name="Pixel Shader Kills Pixel" start="182" end="182" type="bool"/> <field name="Pixel Shader Computed Depth" start="181" end="181" type="bool"/> <field name="Pixel Shader Uses Source Depth" start="180" end="180" type="bool"/> <field name="Thread Dispatch Enable" start="179" end="179" type="bool"/> diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml index d6b266229d..28d9dd501e 100644 --- a/src/intel/genxml/gen5.xml +++ b/src/intel/genxml/gen5.xml @@ -899,7 +899,7 @@ <field name="Statistics Enable" start="128" end="128" type="bool"/> <field name="Maximum Number of Threads" start="185" end="191" type="uint"/> <field name="Legacy Diamond Line Rasterization" start="183" end="183" type="bool"/> - <field name="Pixel Shader Kill Pixel" start="182" end="182" type="bool"/> + <field name="Pixel Shader Kills Pixel" start="182" end="182" type="bool"/> <field name="Pixel Shader Computed Depth" start="181" end="181" type="bool"/> <field name="Pixel Shader Uses Source Depth" start="180" end="180" type="bool"/> <field name="Thread Dispatch Enable" start="179" end="179" type="bool"/> diff --git a/src/mesa/drivers/dri/i965/gen4_blorp_exec.h b/src/mesa/drivers/dri/i965/gen4_blorp_exec.h index 86c5e547b5..f1d9394e24 100644 --- a/src/mesa/drivers/dri/i965/gen4_blorp_exec.h +++ b/src/mesa/drivers/dri/i965/gen4_blorp_exec.h @@ -131,7 +131,7 @@ blorp_emit_wm_state(struct blorp_batch *batch, wm.SetupURBEntryReadOffset = 0; wm.DepthCoefficientURBReadOffset = 1; - wm.PixelShaderKillPixel = prog_data->uses_kill; + wm.PixelShaderKillsPixel = prog_data->uses_kill; wm.ThreadDispatchEnable = true; wm.EarlyDepthTestEnable = true; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit