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/api_validate.c | |
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/api_validate.c')
-rw-r--r-- | mesalib/src/mesa/main/api_validate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/api_validate.c b/mesalib/src/mesa/main/api_validate.c index 6f0250800..e47db23e0 100644 --- a/mesalib/src/mesa/main/api_validate.c +++ b/mesalib/src/mesa/main/api_validate.c @@ -124,7 +124,7 @@ check_valid_to_render(struct gl_context *ctx, const char *function) return GL_FALSE; break; - case API_OPENGL: + case API_OPENGL_COMPAT: case API_OPENGL_CORE: { const struct gl_shader_program *vsProg = @@ -219,7 +219,7 @@ _mesa_valid_prim_mode(struct gl_context *ctx, GLenum mode, const char *name) case GL_QUADS: case GL_QUAD_STRIP: case GL_POLYGON: - valid_enum = (ctx->API == API_OPENGL); + valid_enum = (ctx->API == API_OPENGL_COMPAT); break; case GL_LINES_ADJACENCY: case GL_LINE_STRIP_ADJACENCY: |