OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gles2-2'

Browse Source 
Conflicts:
	src/mesa/drivers/dri/common/dri_util.h
This commit is contained in:
Kristian Høgsberg
2010-05-02 10:17:07 -04:00
parent 9d33605673 9fd5fa0512
commit 0870e4a202
99 changed files with 5042 additions and 4257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/mesa/drivers/dri/intel/intel_screen.c
View File

@@ -357,15 +357,18 @@ extern GLboolean i830CreateContext(const __GLcontextModes * mesaVis,
__DRIcontext * driContextPriv,
void *sharedContextPrivate);
extern GLboolean i915CreateContext(const __GLcontextModes * mesaVis,
extern GLboolean i915CreateContext(int api,
const __GLcontextModes * mesaVis,
__DRIcontext * driContextPriv,
void *sharedContextPrivate);
extern GLboolean brwCreateContext(const __GLcontextModes * mesaVis,
extern GLboolean brwCreateContext(int api,
const __GLcontextModes * mesaVis,
__DRIcontext * driContextPriv,
void *sharedContextPrivate);
static GLboolean
intelCreateContext(const __GLcontextModes * mesaVis,
intelCreateContext(gl_api api,
const __GLcontextModes * mesaVis,
__DRIcontext * driContextPriv,
void *sharedContextPrivate)
{
@@ -375,7 +378,7 @@ intelCreateContext(const __GLcontextModes * mesaVis,
#ifdef I915
if (IS_9XX(intelScreen->deviceID)) {
if (!IS_965(intelScreen->deviceID)) {
return i915CreateContext(mesaVis, driContextPriv,
return i915CreateContext(api, mesaVis, driContextPriv,
sharedContextPrivate);
}
} else {
@@ -384,7 +387,8 @@ intelCreateContext(const __GLcontextModes * mesaVis,
}
#else
if (IS_965(intelScreen->deviceID))
return brwCreateContext(mesaVis, driContextPriv, sharedContextPrivate);
return brwCreateContext(api, mesaVis,
driContextPriv, sharedContextPrivate);
#endif
fprintf(stderr, "Unrecognized deviceID %x\n", intelScreen->deviceID);
return GL_FALSE;
@@ -431,6 +435,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
struct intel_screen *intelScreen;
GLenum fb_format[3];
GLenum fb_type[3];
unsigned int api_mask;
static const GLenum back_buffer_modes[] = {
GLX_NONE, GLX_SWAP_UNDEFINED_OML, GLX_SWAP_COPY_OML
@@ -457,6 +462,17 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
&intelScreen->deviceID))
return GL_FALSE;
api_mask = (1 << __DRI_API_OPENGL);
#if FEATURE_ES1
api_mask |= (1 << __DRI_API_GLES);
#endif
#if FEATURE_ES2
api_mask |= (1 << __DRI_API_GLES2);
#endif
if (IS_9XX(intelScreen->deviceID) || IS_965(intelScreen->deviceID))
psp->api_mask = api_mask;
if (!intel_init_bufmgr(intelScreen))
return GL_FALSE;