ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Don't crash when emulating GL_EXT_fogcoord.

This commit is contained in:
Matteo Bruni 2015-07-27 14:29:56 +02:00 committed by Alexandre Julliard
parent 930d3e6269
commit 6244735f7a
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/wined3d/gl_compat.c
View File

@ -264,6 +264,14 @@ static void (WINE_GLAPI *old_fogcoord_glColor4f) (GLfloat r, GLfloat g, GLfloat
static void WINE_GLAPI wine_glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { static void WINE_GLAPI wine_glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) {
struct wined3d_context *ctx = context_get_current(); struct wined3d_context *ctx = context_get_current();
/* This can be called from draw_test_quad() and at that point there is no
* wined3d_context current. */
if (!ctx)
{
old_fogcoord_glVertex4f(x, y, z, w);
return;
}
if(ctx->gl_fog_source == GL_FOG_COORDINATE_EXT && ctx->fog_enabled) { if(ctx->gl_fog_source == GL_FOG_COORDINATE_EXT && ctx->fog_enabled) {
GLfloat c[4] = {ctx->color[0], ctx->color[1], ctx->color[2], ctx->color[3]}; GLfloat c[4] = {ctx->color[0], ctx->color[1], ctx->color[2], ctx->color[3]};
GLfloat i; GLfloat i;
@ -294,6 +302,14 @@ static void WINE_GLAPI wine_glVertex3fv(const GLfloat *pos) {
static void WINE_GLAPI wine_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) { static void WINE_GLAPI wine_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) {
struct wined3d_context *ctx = context_get_current(); struct wined3d_context *ctx = context_get_current();
/* This can be called from draw_test_quad() and at that point there is no
* wined3d_context current. */
if (!ctx)
{
old_fogcoord_glColor4f(r, g, b, a);
return;
}
ctx->color[0] = r; ctx->color[0] = r;
ctx->color[1] = g; ctx->color[1] = g;
ctx->color[2] = b; ctx->color[2] = b;