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

wined3d: Rename dummyTextureName variable.

This commit is contained in:
Matteo Bruni 2011-08-26 01:12:29 +02:00 committed by Alexandre Julliard
parent e46378c764
commit afeecfd974
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/context.c
View File

@ -1263,7 +1263,7 @@ static void bind_dummy_textures(const struct wined3d_device *device, struct wine
GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i));
checkGLcall("glActiveTextureARB"); checkGLcall("glActiveTextureARB");
glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[i]); glBindTexture(GL_TEXTURE_2D, device->dummy_texture_2d[i]);
checkGLcall("glBindTexture"); checkGLcall("glBindTexture");
if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) if (gl_info->supported[ARB_TEXTURE_RECTANGLE])
@ -1601,7 +1601,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain,
/* If this happens to be the first context for the device, dummy textures /* If this happens to be the first context for the device, dummy textures
* are not created yet. In that case, they will be created (and bound) by * are not created yet. In that case, they will be created (and bound) by
* create_dummy_textures right after this context is initialized. */ * create_dummy_textures right after this context is initialized. */
if (device->dummyTextureName[0]) if (device->dummy_texture_2d[0])
bind_dummy_textures(device, ret); bind_dummy_textures(device, ret);
LEAVE_GL(); LEAVE_GL();
@ -1974,7 +1974,7 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint
/* nothing to do */ /* nothing to do */
break; break;
case GL_TEXTURE_2D: case GL_TEXTURE_2D:
glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[unit]); glBindTexture(GL_TEXTURE_2D, device->dummy_texture_2d[unit]);
checkGLcall("glBindTexture"); checkGLcall("glBindTexture");
break; break;
case GL_TEXTURE_RECTANGLE_ARB: case GL_TEXTURE_RECTANGLE_ARB:

12
dlls/wined3d/device.c
View File

@ -992,11 +992,11 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_
/* Make appropriate texture active */ /* Make appropriate texture active */
context_active_texture(context, gl_info, i); context_active_texture(context, gl_info, i);
glGenTextures(1, &device->dummyTextureName[i]); glGenTextures(1, &device->dummy_texture_2d[i]);
checkGLcall("glGenTextures"); checkGLcall("glGenTextures");
TRACE("Dummy 2D texture %u given name %u.\n", i, device->dummyTextureName[i]); TRACE("Dummy 2D texture %u given name %u.\n", i, device->dummy_texture_2d[i]);
glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[i]); glBindTexture(GL_TEXTURE_2D, device->dummy_texture_2d[i]);
checkGLcall("glBindTexture"); checkGLcall("glBindTexture");
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color);
@ -1079,14 +1079,14 @@ static void destroy_dummy_textures(struct wined3d_device *device, const struct w
checkGLcall("glDeleteTextures(count, device->dummy_texture_rect)"); checkGLcall("glDeleteTextures(count, device->dummy_texture_rect)");
} }
glDeleteTextures(count, device->dummyTextureName); glDeleteTextures(count, device->dummy_texture_2d);
checkGLcall("glDeleteTextures(count, device->dummyTextureName)"); checkGLcall("glDeleteTextures(count, device->dummy_texture_2d)");
LEAVE_GL(); LEAVE_GL();
memset(device->dummy_texture_cube, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_cube)); memset(device->dummy_texture_cube, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_cube));
memset(device->dummy_texture_3d, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_3d)); memset(device->dummy_texture_3d, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_3d));
memset(device->dummy_texture_rect, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_rect)); memset(device->dummy_texture_rect, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_rect));
memset(device->dummyTextureName, 0, gl_info->limits.textures * sizeof(*device->dummyTextureName)); memset(device->dummy_texture_2d, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_2d));
} }
static LONG fullscreen_style(LONG style) static LONG fullscreen_style(LONG style)

2
dlls/wined3d/wined3d_private.h
View File

@ -1722,7 +1722,7 @@ struct wined3d_device
struct wined3d_surface *logo_surface; struct wined3d_surface *logo_surface;
/* Textures for when no other textures are mapped */ /* Textures for when no other textures are mapped */
UINT dummyTextureName[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_2d[MAX_COMBINED_SAMPLERS];
UINT dummy_texture_rect[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_rect[MAX_COMBINED_SAMPLERS];
UINT dummy_texture_3d[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_3d[MAX_COMBINED_SAMPLERS];
UINT dummy_texture_cube[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_cube[MAX_COMBINED_SAMPLERS];