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

wined3d: Remove maxConcurrentLights from the device.

This commit is contained in:
Stefan Dösinger 2011-05-18 09:12:40 +02:00 committed by Alexandre Julliard
parent 1133991e85
commit 5c6c019340
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/wined3d/device.c
View File

@ -1279,8 +1279,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device,
/* Initialize the current view state */
device->view_ident = 1;
device->contexts[0]->last_was_rhw = 0;
glGetIntegerv(GL_MAX_LIGHTS, &device->maxConcurrentLights);
checkGLcall("glGetIntegerv(GL_MAX_LIGHTS, &device->maxConcurrentLights)");
switch (wined3d_settings.offscreen_rendering_mode)
{
@ -2129,9 +2127,10 @@ HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UIN
}
else
{
int i;
unsigned int i;
const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
/* Find a free GL light. */
for (i = 0; i < device->maxConcurrentLights; ++i)
for (i = 0; i < gl_info->limits.lights; ++i)
{
if (!device->updateStateBlock->state.lights[i])
{

2
dlls/wined3d/state.c
View File

@ -3859,7 +3859,7 @@ static void transform_view(DWORD state, struct wined3d_stateblock *stateblock, s
checkGLcall("glLoadMatrixf(...)");
/* Reset lights. TODO: Call light apply func */
for (k = 0; k < stateblock->device->maxConcurrentLights; ++k)
for (k = 0; k < gl_info->limits.lights; ++k)
{
light = stateblock->state.lights[k];
if(!light) continue;

1
dlls/wined3d/wined3d_private.h
View File

@ -1654,7 +1654,6 @@ struct wined3d_device
LONG exStyle;
/* X and GL Information */
GLint maxConcurrentLights;
GLenum offscreenBuffer;
/* Selected capabilities */