fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i915: Drop intelScreenPrivate typedef and just call it struct intel_screen

Browse source
This commit is contained in:
Kristian Høgsberg 2010-02-11 16:44:21 -05:00
parent cbfd4147ca
commit 5777dee02c
4 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/intel/intel_context.c
View file

@ -581,7 +581,7 @@ intelInitContext(struct intel_context *intel,
GLcontext *ctx = &intel->ctx;
GLcontext *shareCtx = (GLcontext *) sharedContextPrivate;
__DRIscreen *sPriv = driContextPriv->driScreenPriv;
intelScreenPrivate *intelScreen = (intelScreenPrivate *) sPriv->private;
struct intel_screen *intelScreen = sPriv->private;
int bo_reuse_mode;
if (!_mesa_initialize_context(&intel->ctx, mesaVis, shareCtx,

2
src/mesa/drivers/dri/intel/intel_context.h
View file

@ -246,7 +246,7 @@ struct intel_context
__DRIdrawable *driDrawable;
__DRIdrawable *driReadDrawable;
__DRIscreen *driScreen;
intelScreenPrivate *intelScreen;
struct intel_screen *intelScreen;
/**
* Configuration cache

10
src/mesa/drivers/dri/intel/intel_screen.c
View file

@ -169,7 +169,7 @@ intel_get_param(__DRIscreen *psp, int param, int *value)
static void
intelDestroyScreen(__DRIscreen * sPriv)
{
intelScreenPrivate *intelScreen = (intelScreenPrivate *) sPriv->private;
struct intel_screen *intelScreen = sPriv->private;
dri_bufmgr_destroy(intelScreen->bufmgr);
driDestroyOptionInfo(&intelScreen->optionCache);
@ -283,7 +283,7 @@ intelCreateContext(const __GLcontextModes * mesaVis,
void *sharedContextPrivate)
{
__DRIscreen *sPriv = driContextPriv->driScreenPriv;
intelScreenPrivate *intelScreen = (intelScreenPrivate *) sPriv->private;
struct intel_screen *intelScreen = sPriv->private;
#ifdef I915
if (IS_9XX(intelScreen->deviceID)) {
@ -304,7 +304,7 @@ intelCreateContext(const __GLcontextModes * mesaVis,
}
static GLboolean
intel_init_bufmgr(intelScreenPrivate *intelScreen)
intel_init_bufmgr(struct intel_screen *intelScreen)
{
__DRIscreen *spriv = intelScreen->driScrnPriv;
int num_fences = 0;
@ -336,7 +336,7 @@ intel_init_bufmgr(intelScreenPrivate *intelScreen)
static const
__DRIconfig **intelInitScreen2(__DRIscreen *psp)
{
intelScreenPrivate *intelScreen;
struct intel_screen *intelScreen;
GLenum fb_format[3];
GLenum fb_type[3];
@ -348,7 +348,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
__DRIconfig **configs = NULL;
/* Allocate the private area */
intelScreen = (intelScreenPrivate *) CALLOC(sizeof(intelScreenPrivate));
intelScreen = CALLOC(sizeof *intelScreen);
if (!intelScreen) {
fprintf(stderr, "\nERROR! Allocating private area failed\n");
return GL_FALSE;

10
src/mesa/drivers/dri/intel/intel_screen.h
View file

@ -34,7 +34,7 @@
#include "i915_drm.h"
#include "xmlconfig.h"
typedef struct
struct intel_screen
{
int deviceID;
int width;
@ -61,14 +61,10 @@ typedef struct
* Configuration cache with default values for all contexts
*/
driOptionCache optionCache;
} intelScreenPrivate;
};
extern GLboolean intelMapScreenRegions(__DRIscreen * sPriv);
extern void intelUnmapScreenRegions(intelScreenPrivate * intelScreen);
extern void intelDestroyContext(__DRIcontext * driContextPriv);
extern GLboolean intelUnbindContext(__DRIcontext * driContextPriv);
@ -78,6 +74,4 @@ intelMakeCurrent(__DRIcontext * driContextPriv,
__DRIdrawable * driDrawPriv,
__DRIdrawable * driReadPriv);
extern struct intel_context *intelScreenContext(intelScreenPrivate *intelScreen);
#endif