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/attrib.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/attrib.c')
-rw-r--r-- | mesalib/src/mesa/main/attrib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c index acb33885a..a19d61054 100644 --- a/mesalib/src/mesa/main/attrib.c +++ b/mesalib/src/mesa/main/attrib.c @@ -1150,7 +1150,7 @@ _mesa_PopAttrib(void) _mesa_PointParameteri(GL_POINT_SPRITE_R_MODE_NV, ctx->Point.SpriteRMode); - if ((ctx->API == API_OPENGL && ctx->Version >= 20) + if ((ctx->API == API_OPENGL_COMPAT && ctx->Version >= 20) || ctx->API == API_OPENGL_CORE) _mesa_PointParameterf(GL_POINT_SPRITE_COORD_ORIGIN, (GLfloat)ctx->Point.SpriteOrigin); |