diff options
| author | Kevin DeKorte <kdekorte@gmail.com> | 2009-07-15 17:13:09 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-07-15 17:13:09 -0400 |
| commit | 92a2f0164aece1584e7c4ea8c5c44af43a1de8c3 (patch) | |
| tree | 3271e814039140179110c7f97dcd5f56e326fbfc /src/mesa/drivers/dri/r600 | |
| parent | 01b793ec7d1ecba53fb0620f07a928872b0ce033 (diff) | |
R6xx/r7xx: warning fixes
Diffstat (limited to 'src/mesa/drivers/dri/r600')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_context.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_chip.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_chip.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_render.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_state.h | 3 |
5 files changed, 20 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r600/r600_context.h b/src/mesa/drivers/dri/r600/r600_context.h index d360f1a2f5..7957be6e0d 100644 --- a/src/mesa/drivers/dri/r600/r600_context.h +++ b/src/mesa/drivers/dri/r600/r600_context.h @@ -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 . diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c index b40550d683..535f55525e 100644 --- a/src/mesa/drivers/dri/r600/r700_chip.c +++ b/src/mesa/drivers/dri/r600/r700_chip.c @@ -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); diff --git a/src/mesa/drivers/dri/r600/r700_chip.h b/src/mesa/drivers/dri/r600/r700_chip.h index 41654fd563..691e9dd741 100644 --- a/src/mesa/drivers/dri/r600/r700_chip.h +++ b/src/mesa/drivers/dri/r600/r700_chip.h @@ -55,6 +55,7 @@ #define ASIC_CONTEXT_BASE_INDEX 0xA000 #define ASIC_CTL_CONST_BASE_INDEX 0xF3FC + enum { SQ_ABSOLUTE = 0x00000000, diff --git a/src/mesa/drivers/dri/r600/r700_render.c b/src/mesa/drivers/dri/r600/r700_render.c index 6ce4c4d40c..9b9d35412e 100644 --- a/src/mesa/drivers/dri/r600/r700_render.c +++ b/src/mesa/drivers/dri/r600/r700_render.c @@ -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); diff --git a/src/mesa/drivers/dri/r600/r700_state.h b/src/mesa/drivers/dri/r600/r700_state.h index 87f0903b67..23246367db 100644 --- a/src/mesa/drivers/dri/r600/r700_state.h +++ b/src/mesa/drivers/dri/r600/r700_state.h @@ -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 */ |