fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-22 02:00:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

freedreno/a6xx: Share shader_t_to_opcode

Browse source 
We have a similar function in fd6_program.c. Move to fd6_emit.h and
share.

Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Kristian H. Kristensen 2019-06-05 21:35:35 -07:00 • committed by Rob Clark
parent 4552162e2d
commit 0ef00ceb2e
3 changed files with 21 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gallium/drivers/freedreno/a6xx/fd6_emit.c
View file

@ -45,24 +45,6 @@
#include "fd6_format.h"
#include "fd6_zsa.h"
static uint32_t
shader_t_to_opcode(gl_shader_stage type)
{
switch (type) {
case MESA_SHADER_VERTEX:
case MESA_SHADER_TESS_CTRL:
case MESA_SHADER_TESS_EVAL:
case MESA_SHADER_GEOMETRY:
return CP_LOAD_STATE6_GEOM;
case MESA_SHADER_FRAGMENT:
case MESA_SHADER_COMPUTE:
case MESA_SHADER_KERNEL:
return CP_LOAD_STATE6_FRAG;
default:
unreachable("bad shader type");
}
}
/* regid: base const register
* prsc or dwords: buffer containing constant values
* sizedwords: size of const value buffer
@ -87,7 +69,7 @@ fd6_emit_const(struct fd_ringbuffer *ring, gl_shader_stage type,
align_sz = align(sz, 4);
OUT_PKT7(ring, shader_t_to_opcode(type), 3 + align_sz);
OUT_PKT7(ring, fd6_stage2opcode(type), 3 + align_sz);
OUT_RING(ring, CP_LOAD_STATE6_0_DST_OFF(regid/4) |
CP_LOAD_STATE6_0_STATE_TYPE(ST6_CONSTANTS) |
CP_LOAD_STATE6_0_STATE_SRC(src) |
@ -121,7 +103,7 @@ fd6_emit_const_bo(struct fd_ringbuffer *ring, gl_shader_stage type, boolean writ
debug_assert((regid % 4) == 0);
OUT_PKT7(ring, shader_t_to_opcode(type), 3 + (2 * anum));
OUT_PKT7(ring, fd6_stage2opcode(type), 3 + (2 * anum));
OUT_RING(ring, CP_LOAD_STATE6_0_DST_OFF(regid/4) |
CP_LOAD_STATE6_0_STATE_TYPE(ST6_CONSTANTS)|
CP_LOAD_STATE6_0_STATE_SRC(SS6_DIRECT) |

18
src/gallium/drivers/freedreno/a6xx/fd6_emit.h
View file

@ -186,6 +186,24 @@ fd6_emit_lrz_flush(struct fd_ringbuffer *ring)
OUT_RING(ring, LRZ_FLUSH);
}
static inline uint32_t
fd6_stage2opcode(gl_shader_stage type)
{
switch (type) {
case MESA_SHADER_VERTEX:
case MESA_SHADER_TESS_CTRL:
case MESA_SHADER_TESS_EVAL:
case MESA_SHADER_GEOMETRY:
return CP_LOAD_STATE6_GEOM;
case MESA_SHADER_FRAGMENT:
case MESA_SHADER_COMPUTE:
case MESA_SHADER_KERNEL:
return CP_LOAD_STATE6_FRAG;
default:
unreachable("bad shader type");
}
}
static inline enum a6xx_state_block
fd6_stage2shadersb(gl_shader_stage type)
{

16
src/gallium/drivers/freedreno/a6xx/fd6_program.c
View file

@ -87,7 +87,6 @@ fd6_emit_shader(struct fd_ringbuffer *ring, const struct ir3_shader_variant *so)
enum a6xx_state_block sb = fd6_stage2shadersb(so->type);
enum a6xx_state_src src;
uint32_t i, sz, *bin;
unsigned opcode;
if (fd_mesa_debug & FD_DBG_DIRECT) {
sz = si->sizedwords;
@ -99,20 +98,7 @@ fd6_emit_shader(struct fd_ringbuffer *ring, const struct ir3_shader_variant *so)
bin = NULL;
}
switch (so->type) {
case MESA_SHADER_VERTEX:
opcode = CP_LOAD_STATE6_GEOM;
break;
case MESA_SHADER_FRAGMENT:
case MESA_SHADER_COMPUTE:
case MESA_SHADER_KERNEL:
opcode = CP_LOAD_STATE6_FRAG;
break;
default:
unreachable("bad shader type");
}
OUT_PKT7(ring, opcode, 3 + sz);
OUT_PKT7(ring, fd6_stage2opcode(so->type), 3 + sz);
OUT_RING(ring, CP_LOAD_STATE6_0_DST_OFF(0) |
CP_LOAD_STATE6_0_STATE_TYPE(ST6_SHADER) |
CP_LOAD_STATE6_0_STATE_SRC(src) |