R6xx/r7xx: warning fixes

This commit is contained in:
Kevin DeKorte 2009-07-15 17:13:09 -04:00 committed by Alex Deucher
parent 01b793ec7d
commit 92a2f0164a
5 changed files with 20 additions and 1 deletions

View file

@ -53,6 +53,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
struct r600_context;
typedef struct r600_context context_t;
GLboolean r700SendPSState(context_t *context);
GLboolean r700SendVSState(context_t *context);
GLboolean r700SendSQConfig(context_t *context);
#include "main/mm.h"
/* From http://gcc. gnu.org/onlinedocs/gcc-3.2.3/gcc/Variadic-Macros.html .

View file

@ -47,6 +47,9 @@ do \
pStateListWork++; \
}while(0)
inline GLboolean needRelocReg(context_t *context, unsigned int reg);
inline static GLboolean setRelocReg(context_t *context, unsigned int reg);
GLboolean r700InitChipObject(context_t *context)
{
ContextState * pStateListWork;
@ -421,7 +424,7 @@ inline GLboolean needRelocReg(context_t *context, unsigned int reg)
return GL_FALSE;
}
inline GLboolean setRelocReg(context_t *context, unsigned int reg)
inline static GLboolean setRelocReg(context_t *context, unsigned int reg)
{
BATCH_LOCALS(&context->radeon);
R700_CHIP_CONTEXT *r700 = R700_CONTEXT_STATES(context);

View file

@ -55,6 +55,7 @@
#define ASIC_CONTEXT_BASE_INDEX 0xA000
#define ASIC_CTL_CONST_BASE_INDEX 0xF3FC
enum
{
SQ_ABSOLUTE = 0x00000000,

View file

@ -54,6 +54,14 @@
#include "r700_fragprog.h"
#include "r700_state.h"
void r700WaitForIdle(context_t *context);
void r700WaitForIdleClean(context_t *context);
void r700Start3D(context_t *context);
GLboolean r700SendTextureState(context_t *context);
GLboolean r700SyncSurf(context_t *context);
unsigned int r700PrimitiveType(int prim);
void r600UpdateTextureState(GLcontext * ctx);
void r700WaitForIdle(context_t *context)
{
BATCH_LOCALS(&context->radeon);

View file

@ -45,4 +45,7 @@ extern void r700InitStateFuncs (struct dd_function_table *functions);
extern void r700SetRenderTarget(context_t *context, int id);
extern void r700SetDefaultStates(context_t * context);
void r700SetScissor(context_t *context);
void r700SetDepthTarget(context_t *context);
#endif /* _R600_SCREEN_H */