aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2016-05-18 11:06:08 -0700
committerKenneth Graunke <[email protected]>2016-05-20 14:44:22 -0700
commitde45da6a8c3091de400adc468682779abc989109 (patch)
tree22faf0247bcbe75e5d56282d682ef3b06cc04653
parent9b8b3f75018ac3d7ab9aa09df012b6d19aa6fae2 (diff)
spirv: Handle the PixelCenterInteger execution mode.
This isn't allowed by Vulkan, but might be useful someday for SPIR-V in OpenGL (if that ever becomes a thing). It's easy enough to hook up, and as precedent, we already do so for OriginLowerLeft. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]>
-rw-r--r--src/compiler/spirv/spirv_to_nir.c3
-rw-r--r--src/compiler/spirv/vtn_private.h1
-rw-r--r--src/compiler/spirv/vtn_variables.c3
3 files changed, 7 insertions, 0 deletions
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index e60bb54106d..359fa5c583a 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -2330,6 +2330,9 @@ vtn_handle_execution_mode(struct vtn_builder *b, struct vtn_value *entry_point,
break;
case SpvExecutionModePixelCenterInteger:
+ b->pixel_center_integer = true;
+ break;
+
case SpvExecutionModeXfb:
assert(!"Unhandled execution mode");
break;
diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h
index 3840d8c4b65..3ecffada2ba 100644
--- a/src/compiler/spirv/vtn_private.h
+++ b/src/compiler/spirv/vtn_private.h
@@ -378,6 +378,7 @@ struct vtn_builder {
const char *entry_point_name;
struct vtn_value *entry_point;
bool origin_upper_left;
+ bool pixel_center_integer;
struct vtn_function *func;
struct exec_list functions;
diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index bbe1166aff0..0c7f0f76718 100644
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -1016,6 +1016,9 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member,
if (builtin == SpvBuiltInFragCoord || builtin == SpvBuiltInSamplePosition)
nir_var->data.origin_upper_left = b->origin_upper_left;
+
+ if (builtin == SpvBuiltInFragCoord)
+ nir_var->data.pixel_center_integer = b->pixel_center_integer;
break;
}
case SpvDecorationRowMajor: