diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2010-05-02 10:17:07 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-05-02 10:17:07 -0400 |
| commit | 0870e4a2022cff79805613ae7cd4b9237a2f564c (patch) | |
| tree | 694d0c07918661996255cff226602045e0d9c707 /src/mesa/drivers/dri/r600/r600_context.c | |
| parent | 9d3360567346036f1c2b0b5e9de9bd123d883762 (diff) | |
| parent | 9fd5fa05122aa0cac0051fa92d1634bde43209db (diff) | |
Merge branch 'gles2-2'
Conflicts:
src/mesa/drivers/dri/common/dri_util.h
Diffstat (limited to 'src/mesa/drivers/dri/r600/r600_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_context.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c index ab6b617235..f4aed4e87f 100644 --- a/src/mesa/drivers/dri/r600/r600_context.c +++ b/src/mesa/drivers/dri/r600/r600_context.c @@ -353,7 +353,8 @@ static void r600InitGLExtensions(GLcontext *ctx) /* Create the device specific rendering context. */ -GLboolean r600CreateContext(const __GLcontextModes * glVisual, +GLboolean r600CreateContext(gl_api api, + const __GLcontextModes * glVisual, __DRIcontext * driContextPriv, void *sharedContextPrivate) { |