diff options
| author | Jason Ekstrand <[email protected]> | 2016-02-20 09:12:36 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-02-20 09:12:38 -0800 |
| commit | 1f1cf6fcb0ea7c27b573aab0396942875fa3dba6 (patch) | |
| tree | 7262655a0681b543600a84e01e7657ffc598e0f0 /src/intel/vulkan | |
| parent | 371b4a5b33a13f35fa7783510d2d90685a9a2e8a (diff) | |
anv: Get rid of GENX_FUNC
It was a bad idea.
Diffstat (limited to 'src/intel/vulkan')
| -rw-r--r-- | src/intel/vulkan/gen7_cmd_buffer.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/intel/vulkan/gen7_cmd_buffer.c b/src/intel/vulkan/gen7_cmd_buffer.c index e96400d5b6c..7377487cf7e 100644 --- a/src/intel/vulkan/gen7_cmd_buffer.c +++ b/src/intel/vulkan/gen7_cmd_buffer.c @@ -70,9 +70,10 @@ cmd_buffer_flush_push_constants(struct anv_cmd_buffer *cmd_buffer) return flushed; } -GENX_FUNC(GEN7, GEN7) void -genX(cmd_buffer_emit_descriptor_pointers)(struct anv_cmd_buffer *cmd_buffer, - uint32_t stages) +#if GEN_GEN == 7 && !GEN_IS_HASWELL +void +gen7_cmd_buffer_emit_descriptor_pointers(struct anv_cmd_buffer *cmd_buffer, + uint32_t stages) { static const uint32_t sampler_state_opcodes[] = { [MESA_SHADER_VERTEX] = 43, @@ -109,8 +110,8 @@ genX(cmd_buffer_emit_descriptor_pointers)(struct anv_cmd_buffer *cmd_buffer, } } -GENX_FUNC(GEN7, GEN7) uint32_t -genX(cmd_buffer_flush_descriptor_sets)(struct anv_cmd_buffer *cmd_buffer) +uint32_t +gen7_cmd_buffer_flush_descriptor_sets(struct anv_cmd_buffer *cmd_buffer) { VkShaderStageFlags dirty = cmd_buffer->state.descriptors_dirty & cmd_buffer->state.pipeline->active_stages; @@ -156,6 +157,7 @@ genX(cmd_buffer_flush_descriptor_sets)(struct anv_cmd_buffer *cmd_buffer) return dirty; } +#endif /* GEN_GEN == 7 && !GEN_IS_HASWELL */ static inline int64_t clamp_int64(int64_t x, int64_t min, int64_t max) |