diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:46:45 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:46:45 +0000 |
| commit | ec17bdcadeac50a232df039afcf5e006bb0e9858 (patch) | |
| tree | 0a84b5978c4fe15e5ad6bca7e99cc3d4797ceb0b /lib/mesa/src/gallium | |
| parent | e3a07a4e68d0d97b1861db30e1ec5f90a573281b (diff) | |
import Mesa 11.0.6
Diffstat (limited to 'lib/mesa/src/gallium')
| -rw-r--r-- | lib/mesa/src/gallium/drivers/freedreno/a2xx/instr-a2xx.h | 51 | ||||
| -rw-r--r-- | lib/mesa/src/gallium/drivers/softpipe/SConscript | 2 |
2 files changed, 18 insertions, 35 deletions
diff --git a/lib/mesa/src/gallium/drivers/freedreno/a2xx/instr-a2xx.h b/lib/mesa/src/gallium/drivers/freedreno/a2xx/instr-a2xx.h index 0078b24b5..0d6e138da 100644 --- a/lib/mesa/src/gallium/drivers/freedreno/a2xx/instr-a2xx.h +++ b/lib/mesa/src/gallium/drivers/freedreno/a2xx/instr-a2xx.h @@ -87,7 +87,6 @@ typedef enum { SIN = 48, COS = 49, RETAIN_PREV = 50, - SCALAR_NONE = 63, } instr_scalar_opc_t; typedef enum { @@ -121,7 +120,6 @@ typedef enum { KILLNEv = 27, DSTv = 28, MOVAv = 29, - VECTOR_NONE = 31, } instr_vector_opc_t; typedef struct PACKED { @@ -149,25 +147,15 @@ typedef struct PACKED { uint8_t const_1_rel_abs : 1; uint8_t const_0_rel_abs : 1; /* dword2: */ - union { - struct { - uint8_t src3_reg : 6; - uint8_t src3_reg_select : 1; - uint8_t src3_reg_abs : 1; - uint8_t src2_reg : 6; - uint8_t src2_reg_select : 1; - uint8_t src2_reg_abs : 1; - uint8_t src1_reg : 6; - uint8_t src1_reg_select : 1; - uint8_t src1_reg_abs : 1; - }; - /* constants have full 8-bit index */ - struct { - uint8_t src3_reg_byte : 8; - uint8_t src2_reg_byte : 8; - uint8_t src1_reg_byte : 8; - }; - }; + uint8_t src3_reg : 6; + uint8_t src3_reg_select : 1; + uint8_t src3_reg_abs : 1; + uint8_t src2_reg : 6; + uint8_t src2_reg_select : 1; + uint8_t src2_reg_abs : 1; + uint8_t src1_reg : 6; + uint8_t src1_reg_select : 1; + uint8_t src1_reg_abs : 1; instr_vector_opc_t vector_opc : 5; uint8_t src3_sel : 1; uint8_t src2_sel : 1; @@ -372,14 +360,16 @@ typedef struct PACKED { uint8_t signed_rf_mode_all : 1; uint8_t reserved1 : 1; instr_surf_fmt_t format : 6; - uint8_t reserved2 : 2; - uint8_t exp_adjust_all : 6; + uint8_t reserved2 : 1; + uint8_t exp_adjust_all : 7; uint8_t reserved3 : 1; uint8_t pred_select : 1; /* dword2: */ uint8_t stride : 8; - uint32_t offset : 22; - uint8_t reserved4 : 1; + /* possibly offset and reserved4 are swapped on a200? */ + uint8_t offset : 8; + uint8_t reserved4 : 8; + uint8_t reserved5 : 7; uint8_t pred_condition : 1; } instr_fetch_vtx_t; @@ -391,17 +381,10 @@ typedef union PACKED { instr_fetch_opc_t opc : 5; uint32_t dummy0 : 27; /* dword1: */ - uint32_t dummy1 : 31; - uint8_t pred_select : 1; + uint32_t dummy1 : 32; /* dword2: */ - uint32_t dummy2 : 31; - uint8_t pred_condition : 1; + uint32_t dummy2 : 32; }; } instr_fetch_t; -typedef union PACKED { - instr_alu_t alu; - instr_fetch_t fetch; -} instr_t; - #endif /* INSTR_H_ */ diff --git a/lib/mesa/src/gallium/drivers/softpipe/SConscript b/lib/mesa/src/gallium/drivers/softpipe/SConscript index 8ae53b676..dc3542c51 100644 --- a/lib/mesa/src/gallium/drivers/softpipe/SConscript +++ b/lib/mesa/src/gallium/drivers/softpipe/SConscript @@ -2,7 +2,7 @@ Import('*') env = env.Clone() -env.MSVC2013Compat() +env.MSVC2008Compat() softpipe = env.ConvenienceLibrary( target = 'softpipe', |