radeon: Minor warnings cleanup.

This commit is contained in:
Eric Anholt 2009-08-12 11:12:46 -07:00
parent e643bc5fc7
commit ef3ad412c7
5 changed files with 16 additions and 7 deletions

View file

@ -158,6 +158,17 @@ extern GLboolean r700InitChipObject(context_t *context);
extern GLboolean r700SendContextStates(context_t *context);
extern GLboolean r700SendViewportState(context_t *context, int id);
extern GLboolean r700SendRenderTargetState(context_t *context, int id);
extern GLboolean r700SendTextureState(context_t *context);
extern GLboolean r700SendDepthTargetState(context_t *context);
extern GLboolean r700SendUCPState(context_t *context);
extern GLboolean r700SendFSState(context_t *context);
extern void r700EmitState(GLcontext * ctx);
extern GLboolean r700SyncSurf(context_t *context,
struct radeon_bo *pbo,
uint32_t read_domain,
uint32_t write_domain,
uint32_t sync_type);
extern int r700SetupStreams(GLcontext * ctx);
extern void r700SetupVTXConstants(GLcontext * ctx,

View file

@ -31,6 +31,7 @@
#include "main/imports.h"
#include "main/mtypes.h"
#include "main/enums.h"
#include "swrast/swrast.h"
#include "radeon_lock.h"
#include "r600_context.h"

View file

@ -33,6 +33,7 @@
#include "tnl/tnl.h"
#include "r600_context.h"
#include "r600_emit.h"
#include "r700_oglprog.h"
#include "r700_fragprog.h"
@ -87,7 +88,6 @@ static void r700DeleteProgram(GLcontext * ctx, struct gl_program *prog)
{
struct r700_vertex_program * vp;
struct r700_fragment_program * fp;
context_t *context = R700_CONTEXT(ctx);
switch (prog->Target)
{

View file

@ -179,8 +179,6 @@ static void r700FetchStateParameter(GLcontext * ctx,
const gl_state_index state[STATE_LENGTH],
GLfloat * value)
{
context_t *context = R700_CONTEXT(ctx);
/* TODO */
}

View file

@ -295,11 +295,10 @@ void radeonDestroyContext(__DRIcontextPrivate *driContextPriv )
GET_CURRENT_CONTEXT(ctx);
radeonContextPtr radeon = (radeonContextPtr) driContextPriv->driverPrivate;
radeonContextPtr current = ctx ? RADEON_CONTEXT(ctx) : NULL;
/* +r6/r7 */
__DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv;
#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R600) /* +r6/r7 */
__DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv;
radeonScreenPtr screen = (radeonScreenPtr) (sPriv->private);
/* --------- */
#endif
if (radeon == current) {
radeon_firevertices(radeon);