Browse Source

r300, r300g: Add missing registers.

tags/mesa_7_7_rc1
Corbin Simpson 16 years ago
parent
commit
cbee31a1f8
2 changed files with 7 additions and 3 deletions
  1. 5
    3
      src/gallium/drivers/r300/r300_reg.h
  2. 2
    0
      src/mesa/drivers/dri/r300/r300_reg.h

+ 5
- 3
src/gallium/drivers/r300/r300_reg.h View File

@@ -1884,6 +1884,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
# define R300_RGB_ADDR0(x) ((x) << 0)
# define R300_RGB_ADDR1(x) ((x) << 6)
# define R300_RGB_ADDR2(x) ((x) << 12)
# define R300_RGB_TARGET(x) ((x) << 29)

#define R300_US_ALU_ALPHA_ADDR_0 0x47C0
# define R300_ALU_SRC0A_SHIFT 0
@@ -1901,9 +1902,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
# define R300_ALU_DSTA_REG (1 << 23)
# define R300_ALU_DSTA_OUTPUT (1 << 24)
# define R300_ALU_DSTA_DEPTH (1 << 27)
# define R300_ALPHA_ADDR0(x) ((x) << 0)
# define R300_ALPHA_ADDR1(x) ((x) << 6)
# define R300_ALPHA_ADDR2(x) ((x) << 12)
# define R300_ALPHA_ADDR0(x) ((x) << 0)
# define R300_ALPHA_ADDR1(x) ((x) << 6)
# define R300_ALPHA_ADDR2(x) ((x) << 12)
# define R300_ALPHA_TARGET(x) ((x) << 25)

#define R300_US_ALU_RGB_INST_0 0x48C0
# define R300_ALU_ARGC_SRC0C_XYZ 0

+ 2
- 0
src/mesa/drivers/dri/r300/r300_reg.h View File

@@ -1789,6 +1789,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
# define R300_ALU_DSTC_OUTPUT_X (1 << 26)
# define R300_ALU_DSTC_OUTPUT_Y (1 << 27)
# define R300_ALU_DSTC_OUTPUT_Z (1 << 28)
# define R300_RGB_TARGET(x) ((x) << 29)

#define R300_US_ALU_ALPHA_ADDR_0 0x47C0
# define R300_ALU_SRC0A_SHIFT 0
@@ -1806,6 +1807,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
# define R300_ALU_DSTA_REG (1 << 23)
# define R300_ALU_DSTA_OUTPUT (1 << 24)
# define R300_ALU_DSTA_DEPTH (1 << 27)
# define R300_ALPHA_TARGET(x) ((x) << 25)

#define R300_US_ALU_RGB_INST_0 0x48C0
# define R300_ALU_ARGC_SRC0C_XYZ 0

Loading…
Cancel
Save