diff options
| author | Ian Romanick <[email protected]> | 2013-12-19 11:04:29 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2014-01-27 14:21:43 -0700 |
| commit | 33214679bb632a80d4339ffa0f28f7620d510658 (patch) | |
| tree | 4ac763c47b62b63e143b5bf11fdeeb1d33a661c2 | |
| parent | af0b34783e4e4f2a5d03444738a785f15bbb755b (diff) | |
radeon / r200: Pass the API into _mesa_initialize_context
Otherwise an application that requested an OpenGL ES 1.x context would
actually get a desktop OpenGL context.
Signed-off-by: Ian Romanick <[email protected]>
Cc: "9.1 9.2 10.0" <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_common_context.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_common_context.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_context.c | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index a7021f2b6e3..637a26332c5 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -271,7 +271,7 @@ GLboolean r200CreateContext( gl_api api, r200InitShaderFuncs(&functions); radeonInitQueryObjFunctions(&functions); - if (!radeonInitContext(&rmesa->radeon, &functions, + if (!radeonInitContext(&rmesa->radeon, api, &functions, glVisual, driContextPriv, sharedContextPrivate)) { free(rmesa); diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c index 925a077bb4f..54db9d549e1 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c @@ -126,6 +126,7 @@ static void radeonInitDriverFuncs(struct dd_function_table *functions) * including the Mesa context itself. */ GLboolean radeonInitContext(radeonContextPtr radeon, + gl_api api, struct dd_function_table* functions, const struct gl_config * glVisual, __DRIcontext * driContextPriv, @@ -147,7 +148,7 @@ GLboolean radeonInitContext(radeonContextPtr radeon, else shareCtx = NULL; - if (!_mesa_initialize_context(&radeon->glCtx, API_OPENGL_COMPAT, + if (!_mesa_initialize_context(&radeon->glCtx, api, glVisual, shareCtx, functions)) return GL_FALSE; diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.h b/src/mesa/drivers/dri/radeon/radeon_common_context.h index ab55071dfba..ce1eb1ea274 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.h +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.h @@ -515,6 +515,7 @@ static inline __DRIdrawable* radeon_get_readable(radeonContextPtr radeon) } GLboolean radeonInitContext(radeonContextPtr radeon, + gl_api api, struct dd_function_table* functions, const struct gl_config * glVisual, __DRIcontext * driContextPriv, diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 73fd1880f1c..7d65e2eb597 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -234,7 +234,7 @@ r100CreateContext( gl_api api, radeonInitTextureFuncs( &rmesa->radeon, &functions ); radeonInitQueryObjFunctions(&functions); - if (!radeonInitContext(&rmesa->radeon, &functions, + if (!radeonInitContext(&rmesa->radeon, api, &functions, glVisual, driContextPriv, sharedContextPrivate)) { free(rmesa); |