OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Get rid of GENX_FUNC

Browse Source 
It was a bad idea.
This commit is contained in:
Jason Ekstrand
2016-02-20 09:12:36 -08:00
parent 371b4a5b33
commit 1f1cf6fcb0
2 changed files with 7 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/intel/genxml/gen_macros.h
View File

@@ -88,61 +88,3 @@
#else
# error "Need to add prefixing macros for this gen"
#endif
/* Macros for comparing gens
*
* TODO: This wasn't the best idea. We really need to deprecate it.
*/
#if (GEN_VERSIONx10 >= 70)
#define __ANV_GEN_GE_GEN7(T, F) T
#else
#define __ANV_GEN_GE_GEN7(T, F) F
#endif
#if (GEN_VERSIONx10 <= 70)
#define __ANV_GEN_LE_GEN7(T, F) T
#else
#define __ANV_GEN_LE_GEN7(T, F) F
#endif
#if (GEN_VERSIONx10 >= 75)
#define __ANV_GEN_GE_GEN75(T, F) T
#else
#define __ANV_GEN_GE_GEN75(T, F) F
#endif
#if (GEN_VERSIONx10 <= 75)
#define __ANV_GEN_LE_GEN75(T, F) T
#else
#define __ANV_GEN_LE_GEN75(T, F) F
#endif
#if (GEN_VERSIONx10 >= 80)
#define __ANV_GEN_GE_GEN8(T, F) T
#else
#define __ANV_GEN_GE_GEN8(T, F) F
#endif
#if (GEN_VERSIONx10 <= 80)
#define __ANV_GEN_LE_GEN8(T, F) T
#else
#define __ANV_GEN_LE_GEN8(T, F) F
#endif
#if (GEN_VERSIONx10 >= 90)
#define __ANV_GEN_GE_GEN9(T, F) T
#else
#define __ANV_GEN_GE_GEN9(T, F) F
#endif
#if (GEN_VERSIONx10 <= 90)
#define __ANV_GEN_LE_GEN9(T, F) T
#else
#define __ANV_GEN_LE_GEN9(T, F) F
#endif
#define __ANV_GEN_IN_RANGE(start, end, T, F) \
__ANV_GEN_GE_##start(__ANV_GEN_LE_##end(T, F), F)
/* Declares a function as static inlind if it's not in range */
#define GENX_FUNC(start, end) __ANV_GEN_IN_RANGE(start, end, , static inline)

10
src/intel/vulkan/gen7_cmd_buffer.c
View File

@@ -70,8 +70,9 @@ 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,
#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[] = {
@@ -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)