diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-08-26 05:30:39 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-08-26 05:30:39 +0000 |
| commit | 27c93456b58343162f7c4ad20ca6bea0c9a91646 (patch) | |
| tree | 945c20b63e0b9975ee40f114c5312f8d8f1a2d0b /lib/mesa/src/broadcom/common | |
| parent | 875b83a3ee95e248388fbf72271acc80f6f97987 (diff) | |
Import Mesa 20.1.6
Diffstat (limited to 'lib/mesa/src/broadcom/common')
| -rw-r--r-- | lib/mesa/src/broadcom/common/v3d_debug.c | 3 | ||||
| -rw-r--r-- | lib/mesa/src/broadcom/common/v3d_debug.h | 19 | ||||
| -rw-r--r-- | lib/mesa/src/broadcom/common/v3d_limits.h | 4 |
3 files changed, 16 insertions, 10 deletions
diff --git a/lib/mesa/src/broadcom/common/v3d_debug.c b/lib/mesa/src/broadcom/common/v3d_debug.c index 4a20dd26e..d4fc648a8 100644 --- a/lib/mesa/src/broadcom/common/v3d_debug.c +++ b/lib/mesa/src/broadcom/common/v3d_debug.c @@ -51,6 +51,7 @@ static const struct debug_control debug_control[] = { { "perf", V3D_DEBUG_PERF}, { "norast", V3D_DEBUG_NORAST}, { "fs", V3D_DEBUG_FS}, + { "gs", V3D_DEBUG_GS}, { "vs", V3D_DEBUG_VS}, { "cs", V3D_DEBUG_CS}, { "always_flush", V3D_DEBUG_ALWAYS_FLUSH}, @@ -65,7 +66,7 @@ v3d_debug_flag_for_shader_stage(gl_shader_stage stage) [MESA_SHADER_VERTEX] = V3D_DEBUG_VS, [MESA_SHADER_TESS_CTRL] = 0, [MESA_SHADER_TESS_EVAL] = 0, - [MESA_SHADER_GEOMETRY] = 0, + [MESA_SHADER_GEOMETRY] = V3D_DEBUG_GS, [MESA_SHADER_FRAGMENT] = V3D_DEBUG_FS, [MESA_SHADER_COMPUTE] = V3D_DEBUG_CS, }; diff --git a/lib/mesa/src/broadcom/common/v3d_debug.h b/lib/mesa/src/broadcom/common/v3d_debug.h index 83c368e35..78578cfd8 100644 --- a/lib/mesa/src/broadcom/common/v3d_debug.h +++ b/lib/mesa/src/broadcom/common/v3d_debug.h @@ -47,15 +47,16 @@ extern uint32_t V3D_DEBUG; #define V3D_DEBUG_VIR (1 << 3) #define V3D_DEBUG_QPU (1 << 4) #define V3D_DEBUG_FS (1 << 5) -#define V3D_DEBUG_VS (1 << 6) -#define V3D_DEBUG_CS (1 << 7) -#define V3D_DEBUG_CL (1 << 8) -#define V3D_DEBUG_SURFACE (1 << 9) -#define V3D_DEBUG_PERF (1 << 10) -#define V3D_DEBUG_NORAST (1 << 11) -#define V3D_DEBUG_ALWAYS_FLUSH (1 << 12) -#define V3D_DEBUG_CLIF (1 << 13) -#define V3D_DEBUG_PRECOMPILE (1 << 14) +#define V3D_DEBUG_GS (1 << 6) +#define V3D_DEBUG_VS (1 << 7) +#define V3D_DEBUG_CS (1 << 8) +#define V3D_DEBUG_CL (1 << 9) +#define V3D_DEBUG_SURFACE (1 << 10) +#define V3D_DEBUG_PERF (1 << 11) +#define V3D_DEBUG_NORAST (1 << 12) +#define V3D_DEBUG_ALWAYS_FLUSH (1 << 13) +#define V3D_DEBUG_CLIF (1 << 14) +#define V3D_DEBUG_PRECOMPILE (1 << 15) #ifdef HAVE_ANDROID_PLATFORM #define LOG_TAG "BROADCOM-MESA" diff --git a/lib/mesa/src/broadcom/common/v3d_limits.h b/lib/mesa/src/broadcom/common/v3d_limits.h index 776847622..e02582035 100644 --- a/lib/mesa/src/broadcom/common/v3d_limits.h +++ b/lib/mesa/src/broadcom/common/v3d_limits.h @@ -30,7 +30,11 @@ #define V3D_CHANNELS 16 #define V3D_MAX_FS_INPUTS 64 +#define V3D_MAX_GS_INPUTS 64 #define V3D_MAX_VS_INPUTS 64 +#define V3D_MAX_ANY_STAGE_INPUTS MAX3(V3D_MAX_VS_INPUTS, \ + V3D_MAX_GS_INPUTS, \ + V3D_MAX_FS_INPUTS) /* Not specifically a hardware limit, just coordination between compiler and * driver. |