r300: fix compiler/linker errors
This commit is contained in:
committed by
Corbin Simpson
parent
3aabfa4608
commit
e1b04da9b3
@@ -21,6 +21,7 @@
|
||||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
#include "r300_chipset.h"
|
||||
#include "pipe/p_debug.h"
|
||||
|
||||
/* r300_chipset: A file all to itself for deducing the various properties of
|
||||
* Radeons. */
|
||||
|
||||
@@ -81,7 +81,7 @@ static int r300_get_param(struct pipe_screen* pscreen, int param)
|
||||
/* IN THEORY */
|
||||
return 0;
|
||||
case PIPE_CAP_TWO_SIDED_STENCIL:
|
||||
if (r300screen->is_r500) {
|
||||
if (r300screen->caps->is_r500) {
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
#include "util/u_math.h"
|
||||
#include "util/u_pack_color.h"
|
||||
#include "pipe/p_debug.h"
|
||||
|
||||
#include "r300_context.h"
|
||||
#include "r300_reg.h"
|
||||
|
||||
@@ -52,7 +52,7 @@ static void r300_surface_fill(struct pipe_context* pipe,
|
||||
return;
|
||||
}
|
||||
|
||||
BEGIN_CS((caps->is_r500) ? 300 : 322);
|
||||
BEGIN_CS((caps->is_r500) ? 309 : 322);
|
||||
R300_PACIFY;
|
||||
OUT_CS_REG(R300_TX_INVALTAGS, 0x0);
|
||||
R300_PACIFY;
|
||||
@@ -289,7 +289,7 @@ OUT_CS_REG(R300_ZB_ZCACHE_CTLSTAT,
|
||||
|
||||
OUT_CS_REG_SEQ(R300_RB3D_COLOROFFSET0, 1);
|
||||
OUT_CS_RELOC(dest->buffer, 0, 0, RADEON_GEM_DOMAIN_VRAM, 0);
|
||||
/* XXX this should not be so rigid */
|
||||
/* XXX this should not be so rigid and it still doesn't work right */
|
||||
OUT_CS_REG(R300_RB3D_COLORPITCH0, (w / 4) | R300_COLOR_TILE_ENABLE |
|
||||
R300_COLOR_FORMAT_ARGB8888);
|
||||
OUT_CS_REG(RB3D_COLOR_CHANNEL_MASK, 0x0000000F);
|
||||
|
||||
Reference in New Issue
Block a user