radeon/r300: Code clean up and logic fix.

This commit is contained in:
Pauli Nieminen
2009-08-22 02:43:00 +03:00
parent bb43c5d1cb
commit c0f4063703
3 changed files with 4 additions and 4 deletions

View File

@@ -572,7 +572,7 @@ static GLuint r300PredictTryDrawPrimsSize(GLcontext *ctx, GLuint nr_prims)
{
struct r300_context *r300 = R300_CONTEXT(ctx);
struct r300_vertex_buffer *vbuf = &r300->vbuf;
int flushed;
GLboolean flushed;
GLuint dwords;
GLuint state_size;

View File

@@ -3,7 +3,7 @@
#include "radeon_bocs_wrapper.h"
int rcommonEnsureCmdBufSpace(radeonContextPtr rmesa, int dwords, const char *caller);
GLboolean rcommonEnsureCmdBufSpace(radeonContextPtr rmesa, int dwords, const char *caller);
int rcommonFlushCmdBuf(radeonContextPtr rmesa, const char *caller);
int rcommonFlushCmdBufLocked(radeonContextPtr rmesa, const char *caller);
void rcommonInitCmdBuf(radeonContextPtr rmesa);

View File

@@ -928,7 +928,7 @@ static void radeon_print_state_atom(radeonContextPtr radeon, struct radeon_state
int i, j, reg, count;
int dwords;
uint32_t packet0;
if (! (DEBUG_CMDBUF || RADEON_DEBUG & DEBUG_STATE))
if (! (DEBUG_CMDBUF && RADEON_DEBUG & DEBUG_STATE) )
return;
if (!radeon->radeonScreen->kernel_mm) {
@@ -1212,7 +1212,7 @@ int rcommonFlushCmdBuf(radeonContextPtr rmesa, const char *caller)
*
* \param dwords The number of dwords we need to be free on the command buffer
*/
int rcommonEnsureCmdBufSpace(radeonContextPtr rmesa, int dwords, const char *caller)
GLboolean rcommonEnsureCmdBufSpace(radeonContextPtr rmesa, int dwords, const char *caller)
{
if ((rmesa->cmdbuf.cs->cdw + dwords + 128) > rmesa->cmdbuf.size
|| radeon_cs_need_flush(rmesa->cmdbuf.cs)) {