Browse Source

intel: Fallback field is a bitmask, use GLbitfield

tags/mesa_7_6_1_rc1
Brian Paul 16 years ago
parent
commit
ea659f8917

+ 6
- 2
src/mesa/drivers/dri/i915/intel_tris.c View File







/**
* Enable/disable a fallback flag.
* \param bit one of INTEL_FALLBACK_x flags.
*/
void void
intelFallback(struct intel_context *intel, GLuint bit, GLboolean mode)
intelFallback(struct intel_context *intel, GLbitfield bit, GLboolean mode)
{ {
GLcontext *ctx = &intel->ctx; GLcontext *ctx = &intel->ctx;
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
GLuint oldfallback = intel->Fallback;
const GLbitfield oldfallback = intel->Fallback;


if (mode) { if (mode) {
intel->Fallback |= bit; intel->Fallback |= bit;

+ 1
- 1
src/mesa/drivers/dri/intel/intel_context.c View File

_vbo_DestroyContext(&intel->ctx); _vbo_DestroyContext(&intel->ctx);


_swrast_DestroyContext(&intel->ctx); _swrast_DestroyContext(&intel->ctx);
intel->Fallback = 0; /* don't call _swrast_Flush later */
intel->Fallback = 0x0; /* don't call _swrast_Flush later */


intel_batchbuffer_free(intel->batch); intel_batchbuffer_free(intel->batch);
intel->batch = NULL; intel->batch = NULL;

+ 7
- 2
src/mesa/drivers/dri/intel/intel_context.h View File

intelVertex *); intelVertex *);
typedef void (*intel_point_func) (struct intel_context *, intelVertex *); typedef void (*intel_point_func) (struct intel_context *, intelVertex *);


/**
* Bits for intel->Fallback field
*/
/*@{*/
#define INTEL_FALLBACK_DRAW_BUFFER 0x1 #define INTEL_FALLBACK_DRAW_BUFFER 0x1
#define INTEL_FALLBACK_READ_BUFFER 0x2 #define INTEL_FALLBACK_READ_BUFFER 0x2
#define INTEL_FALLBACK_DEPTH_BUFFER 0x4 #define INTEL_FALLBACK_DEPTH_BUFFER 0x4
#define INTEL_FALLBACK_USER 0x10 #define INTEL_FALLBACK_USER 0x10
#define INTEL_FALLBACK_RENDERMODE 0x20 #define INTEL_FALLBACK_RENDERMODE 0x20
#define INTEL_FALLBACK_TEXTURE 0x40 #define INTEL_FALLBACK_TEXTURE 0x40
/*@}*/


extern void intelFallback(struct intel_context *intel, GLuint bit,
extern void intelFallback(struct intel_context *intel, GLbitfield bit,
GLboolean mode); GLboolean mode);
#define FALLBACK( intel, bit, mode ) intelFallback( intel, bit, mode ) #define FALLBACK( intel, bit, mode ) intelFallback( intel, bit, mode )


struct dri_metaops meta; struct dri_metaops meta;


GLint refcount; GLint refcount;
GLuint Fallback;
GLbitfield Fallback; /**< mask of INTEL_FALLBACK_x bits */
GLuint NewGLState; GLuint NewGLState;


dri_bufmgr *bufmgr; dri_bufmgr *bufmgr;

Loading…
Cancel
Save