From 629a7b32e044a7a1d660d0db23debb29fb0300d9 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 18 Jul 2016 13:56:23 -0700 Subject: [PATCH] genxml: Add APIMODE_D3D missing enum values and improve consistency. Cc: "12.0" Signed-off-by: Kenneth Graunke Reviewed-by: Jason Ekstrand (cherry picked from commit 6b6727026228bd1eab715034416194317e4d0fc6) --- src/intel/genxml/gen6.xml | 1 + src/intel/genxml/gen7.xml | 1 + src/intel/genxml/gen75.xml | 1 + src/intel/genxml/gen8.xml | 3 ++- src/intel/genxml/gen9.xml | 3 ++- src/intel/vulkan/gen8_pipeline.c | 2 +- 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml index dd682dda660..8bc28a97b36 100644 --- a/src/intel/genxml/gen6.xml +++ b/src/intel/genxml/gen6.xml @@ -787,6 +787,7 @@ + diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml index 15640011626..cbeb2e19ecf 100644 --- a/src/intel/genxml/gen7.xml +++ b/src/intel/genxml/gen7.xml @@ -959,6 +959,7 @@ + diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml index d813b7b7be2..40f3c319a53 100644 --- a/src/intel/genxml/gen75.xml +++ b/src/intel/genxml/gen75.xml @@ -1068,6 +1068,7 @@ + diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml index 4b805e1b5c3..2f94c860fd7 100644 --- a/src/intel/genxml/gen8.xml +++ b/src/intel/genxml/gen8.xml @@ -1115,7 +1115,8 @@ - + + diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml index 54f65d3089d..16e5784cfb2 100644 --- a/src/intel/genxml/gen9.xml +++ b/src/intel/genxml/gen9.xml @@ -1167,7 +1167,8 @@ - + + diff --git a/src/intel/vulkan/gen8_pipeline.c b/src/intel/vulkan/gen8_pipeline.c index 4e04aadfe89..52792a9ad17 100644 --- a/src/intel/vulkan/gen8_pipeline.c +++ b/src/intel/vulkan/gen8_pipeline.c @@ -190,7 +190,7 @@ genX(graphics_pipeline_create)( anv_batch_emit(&pipeline->batch, GENX(3DSTATE_CLIP), clip) { clip.ClipEnable = !(extra && extra->use_rectlist); clip.EarlyCullEnable = true; - clip.APIMode = 1; /* D3D */ + clip.APIMode = APIMODE_D3D; clip.ViewportXYClipTestEnable = true; clip.ClipMode =