diff options
author | marha <marha@users.sourceforge.net> | 2012-12-03 09:16:19 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-12-03 09:16:19 +0100 |
commit | 17464545a9abdd19312065a578d1f69a6b0b015f (patch) | |
tree | d39fde94a445ddde95399d4850ffbbbd357a3a19 /mesalib/src/mesa/main/mtypes.h | |
parent | eba14241fe23d0561687a1e530a57fa0bfc6ab69 (diff) | |
parent | b8da71ffb17d3d16706db04115e9ba1dd8bc49b9 (diff) | |
download | vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.tar.gz vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.tar.bz2 vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012
Diffstat (limited to 'mesalib/src/mesa/main/mtypes.h')
-rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index da72da9d1..5bfae69c8 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -2605,7 +2605,7 @@ struct gl_renderbuffer gl_format Format; /**< The actual renderbuffer memory format */ /** Delete this renderbuffer */ - void (*Delete)(struct gl_renderbuffer *rb); + void (*Delete)(struct gl_context *ctx, struct gl_renderbuffer *rb); /** Allocate new storage for this renderbuffer */ GLboolean (*AllocStorage)(struct gl_context *ctx, @@ -3315,7 +3315,7 @@ struct gl_debug_state */ typedef enum { - API_OPENGL, /* legacy / compatibility contexts */ + API_OPENGL_COMPAT, /* legacy / compatibility contexts */ API_OPENGLES, API_OPENGLES2, API_OPENGL_CORE, |