NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

intel: Clean up bits of cruft in intelCreateContext

Browse source 
This and the previous three commits should probably be squashed together...

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Ian Romanick 2012-08-07 12:46:22 -07:00
parent bf8644e64d
commit 91473485fc
1 changed files with 11 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -663,23 +663,6 @@ intelCreateContext(gl_api api,
struct intel_screen *intelScreen = sPriv->driverPrivate;
bool success = false;
switch (api) {
case API_OPENGL:
case API_OPENGLES:
break;
case API_OPENGLES2:
#ifdef I915
if (!IS_9XX(intelScreen->deviceID)) {
*error = __DRI_CTX_ERROR_BAD_API;
return false;
}
#endif
break;
case API_OPENGL_CORE:
*error = __DRI_CTX_ERROR_BAD_API;
return GL_FALSE;
}
#ifdef I915
if (IS_9XX(intelScreen->deviceID)) {
success = i915CreateContext(api, mesaVis, driContextPriv,
@ -690,22 +673,22 @@ intelCreateContext(gl_api api,
case API_OPENGL:
if (major_version > 1 || minor_version > 3) {
*error = __DRI_CTX_ERROR_BAD_VERSION;
return false;
success = false;
}
break;
case API_OPENGLES:
break;
default:
*error = __DRI_CTX_ERROR_BAD_API;
return false;
success = false;
}
intelScreen->no_vbo = true;
success = i830CreateContext(mesaVis, driContextPriv,
sharedContextPrivate);
if (!success) {
*error = __DRI_CTX_ERROR_NO_MEMORY;
return false;
if (success) {
intelScreen->no_vbo = true;
success = i830CreateContext(mesaVis, driContextPriv,
sharedContextPrivate);
if (!success)
*error = __DRI_CTX_ERROR_NO_MEMORY;
}
}
#else
@ -715,22 +698,10 @@ intelCreateContext(gl_api api,
error, sharedContextPrivate);
#endif
if (success) {
struct gl_context *ctx =
(struct gl_context *) driContextPriv->driverPrivate;
_mesa_compute_version(ctx);
if (ctx->Version >= major_version * 10 + minor_version) {
return true;
}
*error = __DRI_CTX_ERROR_BAD_VERSION;
intelDestroyContext(driContextPriv);
} else {
*error = __DRI_CTX_ERROR_NO_MEMORY;
fprintf(stderr, "Unrecognized deviceID 0x%x\n", intelScreen->deviceID);
}
if (success)
return true;
intelDestroyContext(driContextPriv);
return false;
}