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

a5xx: implement logicop support

Browse Source 
The former 0x60 hardcoded in is equivalent to ROP_COPY with the shift.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Acked-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Ilia Mirkin
2017-07-04 17:58:41 -04:00
parent abe8740e33
commit def1b94c33
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/drivers/freedreno/a5xx/a5xx.xml.h
View File

@@ -8,7 +8,7 @@ http://github.com/freedreno/envytools/
git clone https://github.com/freedreno/envytools.git git clone https://github.com/freedreno/envytools.git
The rules-ng-ng source files this header was generated from are: The rules-ng-ng source files this header was generated from are:
- /home/ilia/src/freedreno/envytools/rnndb/adreno/a5xx.xml ( 141534 bytes, from 2017-07-04 21:36:44) - /home/ilia/src/freedreno/envytools/rnndb/adreno/a5xx.xml ( 141659 bytes, from 2017-07-04 21:50:01)
- /home/ilia/src/freedreno/envytools/rnndb/freedreno_copyright.xml ( 1572 bytes, from 2016-02-11 01:04:14) - /home/ilia/src/freedreno/envytools/rnndb/freedreno_copyright.xml ( 1572 bytes, from 2016-02-11 01:04:14)
- /home/ilia/src/freedreno/envytools/rnndb/adreno/adreno_common.xml ( 13324 bytes, from 2017-07-04 02:59:47) - /home/ilia/src/freedreno/envytools/rnndb/adreno/adreno_common.xml ( 13324 bytes, from 2017-07-04 02:59:47)
- /home/ilia/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml ( 31866 bytes, from 2017-07-04 02:59:47) - /home/ilia/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml ( 31866 bytes, from 2017-07-04 02:59:47)
@@ -3039,6 +3039,13 @@ static inline uint32_t REG_A5XX_RB_MRT(uint32_t i0) { return 0x0000e150 + 0x7*i0
static inline uint32_t REG_A5XX_RB_MRT_CONTROL(uint32_t i0) { return 0x0000e150 + 0x7*i0; } static inline uint32_t REG_A5XX_RB_MRT_CONTROL(uint32_t i0) { return 0x0000e150 + 0x7*i0; }
#define A5XX_RB_MRT_CONTROL_BLEND 0x00000001 #define A5XX_RB_MRT_CONTROL_BLEND 0x00000001
#define A5XX_RB_MRT_CONTROL_BLEND2 0x00000002 #define A5XX_RB_MRT_CONTROL_BLEND2 0x00000002
#define A5XX_RB_MRT_CONTROL_ROP_ENABLE 0x00000004
#define A5XX_RB_MRT_CONTROL_ROP_CODE__MASK 0x00000078
#define A5XX_RB_MRT_CONTROL_ROP_CODE__SHIFT 3
static inline uint32_t A5XX_RB_MRT_CONTROL_ROP_CODE(enum a3xx_rop_code val)
{
return ((val) << A5XX_RB_MRT_CONTROL_ROP_CODE__SHIFT) & A5XX_RB_MRT_CONTROL_ROP_CODE__MASK;
}
#define A5XX_RB_MRT_CONTROL_COMPONENT_ENABLE__MASK 0x00000780 #define A5XX_RB_MRT_CONTROL_COMPONENT_ENABLE__MASK 0x00000780
#define A5XX_RB_MRT_CONTROL_COMPONENT_ENABLE__SHIFT 7 #define A5XX_RB_MRT_CONTROL_COMPONENT_ENABLE__SHIFT 7
static inline uint32_t A5XX_RB_MRT_CONTROL_COMPONENT_ENABLE(uint32_t val) static inline uint32_t A5XX_RB_MRT_CONTROL_COMPONENT_ENABLE(uint32_t val)

9
src/gallium/drivers/freedreno/a5xx/fd5_blend.c
View File

@@ -59,12 +59,12 @@ fd5_blend_state_create(struct pipe_context *pctx,
const struct pipe_blend_state *cso) const struct pipe_blend_state *cso)
{ {
struct fd5_blend_stateobj *so; struct fd5_blend_stateobj *so;
// enum a3xx_rop_code rop = ROP_COPY; enum a3xx_rop_code rop = ROP_COPY;
bool reads_dest = false; bool reads_dest = false;
unsigned i, mrt_blend = 0; unsigned i, mrt_blend = 0;
if (cso->logicop_enable) { if (cso->logicop_enable) {
// rop = cso->logicop_func; /* maps 1:1 */ rop = cso->logicop_func; /* maps 1:1 */
switch (cso->logicop_func) { switch (cso->logicop_func) {
case PIPE_LOGICOP_NOR: case PIPE_LOGICOP_NOR:
@@ -117,9 +117,8 @@ fd5_blend_state_create(struct pipe_context *pctx,
so->rb_mrt[i].control = so->rb_mrt[i].control =
// A5XX_RB_MRT_CONTROL_ROP_CODE(rop) | A5XX_RB_MRT_CONTROL_ROP_CODE(rop) |
// COND(cso->logicop_enable, A5XX_RB_MRT_CONTROL_ROP_ENABLE) | COND(cso->logicop_enable, A5XX_RB_MRT_CONTROL_ROP_ENABLE) |
0x60 | /* XXX set other than RECTLIST clear blits?? */
A5XX_RB_MRT_CONTROL_COMPONENT_ENABLE(rt->colormask); A5XX_RB_MRT_CONTROL_COMPONENT_ENABLE(rt->colormask);
if (rt->blend_enable) { if (rt->blend_enable) {

2
src/gallium/drivers/freedreno/a5xx/fd5_emit.c
View File

@@ -679,7 +679,7 @@ fd5_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
if (is_int) { if (is_int) {
control &= A5XX_RB_MRT_CONTROL_COMPONENT_ENABLE__MASK; control &= A5XX_RB_MRT_CONTROL_COMPONENT_ENABLE__MASK;
// control |= A5XX_RB_MRT_CONTROL_ROP_CODE(ROP_COPY); control |= A5XX_RB_MRT_CONTROL_ROP_CODE(ROP_COPY);
} }
if (has_alpha) { if (has_alpha) {