wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Lucas Fialho Zawacki : dinput: Made EnumDevicesBySemantics more terse.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 13421a210b0c6d1b2f97b670744e37b6380945bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=13421a210b0c6d1b2f97b6707… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Fri Jul 8 15:00:40 2011 -0300 dinput: Made EnumDevicesBySemantics more terse. --- dlls/dinput/dinput_main.c | 79 +++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 46 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 7b46839..207d559 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -842,12 +842,13 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( LPVOID pvRef, DWORD dwFlags ) { + static const REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse }; + static const DWORD actionMasks[] = { DIKEYBOARD_MASK, DIMOUSE_MASK }; IDirectInputImpl *This = impl_from_IDirectInput8A( iface ); DIDEVICEINSTANCEA didevi; LPDIRECTINPUTDEVICE8A lpdid; - BOOL ret; - DWORD callbackFlags = 0; - int i; + int i, j; + FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, ptszUserName, lpdiActionFormat, lpCallback, pvRef, dwFlags); @@ -864,29 +865,22 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); - /* enum the keyboard first */ - IDirectInput_CreateDevice(iface, &GUID_SysKeyboard, &lpdid, NULL); - IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* if there's any DIKEYBOARD action, keyboard is priority 1*/ - for(i=0; i < lpdiActionFormat->dwActionSize; i++) - if ((lpdiActionFormat->rgoAction[i].dwSemantic & DIKEYBOARD_MASK) == DIKEYBOARD_MASK) - callbackFlags |= DIEDBS_MAPPEDPRI1; - - ret = lpCallback(&didevi, lpdid, callbackFlags, 1, pvRef); - - if (ret == DIENUM_STOP) return DI_OK; + /* Enumerate keyboard and mouse */ + for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) + { + DWORD callbackFlags = 0; - callbackFlags = 0; + IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* and then the mouse */ - IDirectInput_CreateDevice(iface, &GUID_SysMouse, &lpdid, NULL); - IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* same as above, but for the mouse */ - for(i=0; i < lpdiActionFormat->dwActionSize; i++) - if ((lpdiActionFormat->rgoAction[i].dwSemantic & DIMOUSE_MASK) == DIMOUSE_MASK) - callbackFlags |= DIEDBS_MAPPEDPRI1; + /* If there's at least one action for the device it's priority 1 */ + for(j=0; j < lpdiActionFormat->dwActionSize; j++) + if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[j]) == actionMasks[j]) + callbackFlags |= DIEDBS_MAPPEDPRI1; - lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef); + if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP) + return DI_OK; + } return DI_OK; } @@ -897,41 +891,34 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( LPVOID pvRef, DWORD dwFlags ) { + static const REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse }; + static const DWORD actionMasks[] = { DIKEYBOARD_MASK, DIMOUSE_MASK }; IDirectInputImpl *This = impl_from_IDirectInput8W(iface); DIDEVICEINSTANCEW didevi; LPDIRECTINPUTDEVICE8W lpdid; - BOOL ret; - DWORD callbackFlags = 0; - int i; + int i, j; FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_w(ptszUserName), lpdiActionFormat, lpCallback, pvRef, dwFlags); didevi.dwSize = sizeof(didevi); - /* enum the keyboard first */ - IDirectInput_CreateDevice(iface, &GUID_SysKeyboard, &lpdid, NULL); - IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* if there's any DIKEYBOARD action, keyboard is priority 1*/ - for(i=0; i < lpdiActionFormat->dwActionSize; i++) - if ((lpdiActionFormat->rgoAction[i].dwSemantic & DIKEYBOARD_MASK) == DIKEYBOARD_MASK) - callbackFlags |= DIEDBS_MAPPEDPRI1; - - ret = lpCallback(&didevi, lpdid, callbackFlags, 1, pvRef); - - if (ret == DIENUM_STOP) return DI_OK; + /* Enumerate keyboard and mouse */ + for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) + { + DWORD callbackFlags = 0; - callbackFlags = 0; + IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* and then the mouse */ - IDirectInput_CreateDevice(iface, &GUID_SysMouse, &lpdid, NULL); - IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - /* same as above, but for the mouse */ - for(i=0; i < lpdiActionFormat->dwActionSize; i++) - if ((lpdiActionFormat->rgoAction[i].dwSemantic & DIMOUSE_MASK) == DIMOUSE_MASK) - callbackFlags |= DIEDBS_MAPPEDPRI1; + /* If there's at least one action for the device it's priority 1 */ + for(j=0; j < lpdiActionFormat->dwActionSize; j++) + if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[j]) == actionMasks[j]) + callbackFlags |= DIEDBS_MAPPEDPRI1; - lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef); + if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP) + return DI_OK; + } return DI_OK; }

1 0

Lucas Fialho Zawacki : dinput8/tests: Tests for EnumDevicesBySemantics with different enumeration flags.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: a85f66e7a723bca960d5fb07044fbb838275ef10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85f66e7a723bca960d5fb070… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Fri Jul 8 15:00:21 2011 -0300 dinput8/tests: Tests for EnumDevicesBySemantics with different enumeration flags. --- dlls/dinput8/tests/device.c | 63 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 58 insertions(+), 5 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 3d35632..e86e0d8 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -187,6 +187,28 @@ static BOOL CALLBACK enumeration_callback( return DIENUM_CONTINUE; } +/* A simpler callback function used to count and check + the enumeration of devices. +*/ +static BOOL CALLBACK counting_callback( + LPCDIDEVICEINSTANCE lpddi, + LPDIRECTINPUTDEVICE8 lpdid, + DWORD dwFlags, + DWORD dwRemaining, + LPVOID pvRef) +{ + struct enum_data *data = pvRef; + if (!data) return DIENUM_CONTINUE; + + data->ndevices++; + if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysKeyboard)) + data->keyboard = lpdid; + + if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysMouse)) + data->mouse = lpdid; + + return DIENUM_CONTINUE; +} static void test_action_mapping(void) { @@ -194,7 +216,8 @@ static void test_action_mapping(void) HINSTANCE hinst = GetModuleHandle(NULL); LPDIRECTINPUT8 pDI = NULL; DIACTIONFORMAT af; - struct enum_data data = {pDI, &af, NULL, NULL, 0}; + struct enum_data data = {pDI, &af, NULL, NULL, 0}; + struct enum_data count = {pDI, &af, NULL, NULL, 0}; hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1, &IID_IDirectInput8A, (LPVOID*)&pDI); if (hr == DIERR_OLDDIRECTINPUTVERSION || @@ -226,12 +249,42 @@ static void test_action_mapping(void) af.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ af.dwBufferSize = 32; - hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, &data, 0); + /* Test enumerating all attached and installed devices */ + count.keyboard = NULL; + count.mouse = NULL; + count.ndevices = 0; + hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, counting_callback, &count, DIEDBSFL_ATTACHEDONLY); + ok (count.ndevices > 0, "EnumDevicesBySemantics did not call the callback hr=%08x\n", hr); + ok (count.keyboard != NULL, "EnumDevicesBySemantics should enumerate the keyboard\n"); + ok (count.mouse != NULL, "EnumDevicesBySemantics should enumerate the mouse\n"); + + /* Enumerate Force feedback devices. We should get no mouse nor keyboard */ + count.keyboard = NULL; + count.mouse = NULL; + hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, counting_callback, &count, DIEDBSFL_FORCEFEEDBACK); + ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); + todo_wine ok (count.keyboard == NULL, "Keyboard should not be enumerated when asking for forcefeedback\n"); + todo_wine ok (count.mouse == NULL, "Mouse should not be enumerated when asking for forcefeedback\n"); + + /* Enumerate available devices. That is devices with not owned by any user. + Before setting the action map for all devices we still have them available. + */ + count.ndevices = 0; + hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, counting_callback, &count, DIEDBSFL_AVAILABLEDEVICES); + ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); + ok (count.ndevices > 0, "There should be devices available before action mapping available=%d\n", count.ndevices); + + /* This enumeration builds and sets the action map for all devices */ + hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, &data, DIEDBSFL_ATTACHEDONLY); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); - ok (data.ndevices > 0, "EnumDevicesBySemantics did not call the callback hr=%08x\n", hr); - ok (data.keyboard != NULL, "EnumDevicesBySemantics should enumerate the keyboard\n"); - ok (data.mouse != NULL, "EnumDevicesBySemantics should enumerate the mouse\n"); + /* After a succesfull action mapping we should have no devices available */ + count.ndevices = 0; + hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, counting_callback, &count, DIEDBSFL_AVAILABLEDEVICES); + ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); + todo_wine ok (count.ndevices == 0, "No device should be available after action mapping available=%d\n", count.ndevices); + + /* Use the devices we collect for some tests */ if (data.keyboard != NULL) { /* Test keyboard BuildActionMap */

1 0

Frédéric Delanoy : cmd/tests: Add support for todo_wine constructions.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 88ff0e816a39304e37a4fcbf5bea55f8270ce579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ff0e816a39304e37a4fcbf5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 9 23:33:59 2011 +0200 cmd/tests: Add support for todo_wine constructions. --- programs/cmd/tests/batch.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 95366da..03c2b56 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -190,6 +190,8 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da { const char *out_ptr = out_data, *exp_ptr = exp_data, *out_nl, *exp_nl, *err; DWORD line = 0; + static const char todo_wine_cmd[] = {'@','t','o','d','o','_','w','i','n','e','@'}; + BOOL is_todo_wine; while(out_ptr < out_data+out_size && exp_ptr < exp_data+exp_size) { line++; @@ -197,13 +199,22 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da for(exp_nl = exp_ptr; exp_nl < exp_data+exp_size && *exp_nl != '\r' && *exp_nl != '\n'; exp_nl++); for(out_nl = out_ptr; out_nl < out_data+out_size && *out_nl != '\r' && *out_nl != '\n'; out_nl++); + is_todo_wine = (exp_ptr+sizeof(todo_wine_cmd) <= exp_nl && + !memcmp(exp_ptr, todo_wine_cmd, sizeof(todo_wine_cmd))); + if (is_todo_wine) { + exp_ptr += sizeof(todo_wine_cmd); + winetest_start_todo("wine"); + } + err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); if(err == out_nl) ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); - else if(err) - ok(0, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", - *err, (int)(err-out_ptr), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else + ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", + (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + + if(is_todo_wine) winetest_end_todo("wine"); exp_ptr = exp_nl+1; out_ptr = out_nl+1;

1 0

Natanael Copa : configure: Test for isinf and isnan needs link to -lm.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 3b11f79b7b74e3d5f24db33173d6c5600e2e4b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b11f79b7b74e3d5f24db3317… Author: Natanael Copa <ncopa(a)alpinelinux.org> Date: Wed Jul 6 08:58:01 2011 +0000 configure: Test for isinf and isnan needs link to -lm. --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 61efbd9..2694c59 100755 --- a/configure +++ b/configure @@ -14270,6 +14270,8 @@ $as_echo "#define HAVE_DAYLIGHT 1" >>confdefs.h fi +ac_save_LIBS="$LIBS" +LIBS="$LIBS -lm" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinf" >&5 $as_echo_n "checking for isinf... " >&6; } if ${ac_cv_have_isinf+:} false; then : @@ -14335,6 +14337,7 @@ then $as_echo "#define HAVE_ISNAN 1" >>confdefs.h fi +LIBS="$ac_save_LIBS" case $host_cpu in diff --git a/configure.ac b/configure.ac index 3d493cf..dccc4d3 100644 --- a/configure.ac +++ b/configure.ac @@ -2327,6 +2327,8 @@ then fi dnl Check for isinf +ac_save_LIBS="$LIBS" +LIBS="$LIBS -lm" AC_CACHE_CHECK([for isinf], ac_cv_have_isinf, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; return isinf(f)]])],[ac_cv_have_isinf="yes"],[ac_cv_have_isinf="no"])) if test "$ac_cv_have_isinf" = "yes" @@ -2341,6 +2343,7 @@ if test "$ac_cv_have_isnan" = "yes" then AC_DEFINE(HAVE_ISNAN, 1, [Define to 1 if you have the `isnan' function.]) fi +LIBS="$ac_save_LIBS" dnl *** check for the need to define platform-specific symbols

1 0

William Pettersson : winex11: Add grab for XInput2 ButtonPress event.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 266cd6c46acf7465ad65ae2b963a75cfc21d63d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=266cd6c46acf7465ad65ae2b9… Author: William Pettersson <william.pettersson(a)gmail.com> Date: Mon Jul 11 10:29:26 2011 +1000 winex11: Add grab for XInput2 ButtonPress event. --- dlls/winex11.drv/mouse.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7f62658..980552d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -305,6 +305,7 @@ static void enable_xinput2(void) mask.mask_len = sizeof(mask_bits); memset( mask_bits, 0, sizeof(mask_bits) ); XISetMask( mask_bits, XI_RawMotion ); + XISetMask( mask_bits, XI_ButtonPress ); for (i = 0; i < count; ++i) {

1 0

Henri Verbeet : wined3d: Store a struct wined3d_bo_address in struct wined3d_stream_info_element.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: c5d457c8b4d9ff699799c7476d5f38518a470fcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d457c8b4d9ff699799c7476… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 01:06:46 2011 +0200 wined3d: Store a struct wined3d_bo_address in struct wined3d_stream_info_element. Instead of using separate fields for the buffer object and offset. --- dlls/wined3d/buffer.c | 4 +- dlls/wined3d/device.c | 45 ++++++++++--------- dlls/wined3d/drawprim.c | 28 ++++++------ dlls/wined3d/state.c | 96 ++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 9 ++-- 5 files changed, 93 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5d457c8b4d9ff699799c…

1 0

Henri Verbeet : wined3d: Return data as struct wined3d_bo_address in buffer_get_memory().
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 89bf30a25e5c9342de52b1c6d742009a9b03f8ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=89bf30a25e5c9342de52b1c6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 01:06:45 2011 +0200 wined3d: Return data as struct wined3d_bo_address in buffer_get_memory(). --- dlls/wined3d/buffer.c | 15 ++++++++------- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index fa14f3a..305b5e9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -467,10 +467,10 @@ static inline void fixup_transformed_pos(float *p) } /* Context activation is done by the caller. */ -const BYTE *buffer_get_memory(struct wined3d_buffer *buffer, - const struct wined3d_gl_info *gl_info, GLuint *buffer_object) +void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_info *gl_info, + struct wined3d_bo_address *data) { - *buffer_object = buffer->buffer_object; + data->buffer_object = buffer->buffer_object; if (!buffer->buffer_object) { if (buffer->flags & WINED3D_BUFFER_CREATEBO) @@ -479,15 +479,16 @@ const BYTE *buffer_get_memory(struct wined3d_buffer *buffer, buffer->flags &= ~WINED3D_BUFFER_CREATEBO; if (buffer->buffer_object) { - *buffer_object = buffer->buffer_object; - return NULL; + data->buffer_object = buffer->buffer_object; + data->addr = NULL; + return; } } - return buffer->resource.allocatedMemory; + data->addr = buffer->resource.allocatedMemory; } else { - return NULL; + data->addr = NULL; } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7c03df3..5cc1c84 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -213,7 +213,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, else { TRACE("Stream %u isn't UP, %p\n", element->input_slot, buffer); - data.addr = buffer_get_memory(buffer, &device->adapter->gl_info, &data.buffer_object); + buffer_get_memory(buffer, &device->adapter->gl_info, &data); /* Can't use vbo's if the base vertex index is negative. OpenGL doesn't accept negative offsets * (or rather offsets bigger than the vbo, because the pointer is unsigned), so use system memory diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ca852ee..6119a06 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2405,8 +2405,8 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_buffer, resource); } -const BYTE *buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_info *gl_info, - GLuint *buffer_object) DECLSPEC_HIDDEN; +void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_info *gl_info, + struct wined3d_bo_address *data) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view

1 0

Henri Verbeet : wined3d: Store VBO addresses in a struct wined3d_bo_address in device_stream_info_from_declaration ().
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: a3538a1546a925d740d134fe0255cc0dd9e54887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3538a1546a925d740d134fe0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 01:06:44 2011 +0200 wined3d: Store VBO addresses in a struct wined3d_bo_address in device_stream_info_from_declaration(). --- dlls/wined3d/device.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b10fde6..7c03df3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -190,8 +190,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, { const struct wined3d_vertex_declaration_element *element = &declaration->elements[i]; struct wined3d_buffer *buffer = device->stateBlock->state.streams[element->input_slot].buffer; - GLuint buffer_object = 0; - const BYTE *data = NULL; + struct wined3d_bo_address data; BOOL stride_used; unsigned int idx; DWORD stride; @@ -201,17 +200,20 @@ void device_stream_info_from_declaration(struct wined3d_device *device, if (!buffer) continue; + data.buffer_object = 0; + data.addr = NULL; + stride = device->stateBlock->state.streams[element->input_slot].stride; if (device->stateBlock->state.user_stream) { TRACE("Stream %u is UP, %p\n", element->input_slot, buffer); - buffer_object = 0; - data = (BYTE *)buffer; + data.buffer_object = 0; + data.addr = (BYTE *)buffer; } else { TRACE("Stream %u isn't UP, %p\n", element->input_slot, buffer); - data = buffer_get_memory(buffer, &device->adapter->gl_info, &buffer_object); + data.addr = buffer_get_memory(buffer, &device->adapter->gl_info, &data.buffer_object); /* Can't use vbo's if the base vertex index is negative. OpenGL doesn't accept negative offsets * (or rather offsets bigger than the vbo, because the pointer is unsigned), so use system memory @@ -222,9 +224,9 @@ void device_stream_info_from_declaration(struct wined3d_device *device, { WARN("load_base_vertex_index is < 0 (%d), not using VBOs.\n", device->stateBlock->state.load_base_vertex_index); - buffer_object = 0; - data = buffer_get_sysmem(buffer, &device->adapter->gl_info); - if ((UINT_PTR)data < -device->stateBlock->state.load_base_vertex_index * stride) + data.buffer_object = 0; + data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info); + if ((UINT_PTR)data.addr < -device->stateBlock->state.load_base_vertex_index * stride) { FIXME("System memory vertex data load offset is negative!\n"); } @@ -232,7 +234,8 @@ void device_stream_info_from_declaration(struct wined3d_device *device, if (fixup) { - if (buffer_object) *fixup = TRUE; + if (data.buffer_object) + *fixup = TRUE; else if (*fixup && !use_vshader && (element->usage == WINED3DDECLUSAGE_COLOR || element->usage == WINED3DDECLUSAGE_POSITIONT)) @@ -247,7 +250,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, } } } - data += element->offset; + data.addr += element->offset; TRACE("offset %u input_slot %u usage_idx %d\n", element->offset, element->input_slot, element->usage_idx); @@ -287,13 +290,13 @@ void device_stream_info_from_declaration(struct wined3d_device *device, "input_slot %u, offset %u, stride %u, format %s, buffer_object %u]\n", use_vshader ? "shader": "fixed function", idx, debug_d3ddeclusage(element->usage), element->usage_idx, element->input_slot, - element->offset, stride, debug_d3dformat(element->format->id), buffer_object); + element->offset, stride, debug_d3dformat(element->format->id), data.buffer_object); stream_info->elements[idx].format = element->format; stream_info->elements[idx].stride = stride; - stream_info->elements[idx].data = data; + stream_info->elements[idx].data = data.addr; stream_info->elements[idx].stream_idx = element->input_slot; - stream_info->elements[idx].buffer_object = buffer_object; + stream_info->elements[idx].buffer_object = data.buffer_object; if (!device->adapter->gl_info.supported[ARB_VERTEX_ARRAY_BGRA] && element->format->id == WINED3DFMT_B8G8R8A8_UNORM)

1 0

Henri Verbeet : wined3d: Make the surface parameter to d3dfmt_p8_init_palette() const.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: abfd6b479a884898580beaaefa2b0f15a8351822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfd6b479a884898580beaaef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 01:06:43 2011 +0200 wined3d: Make the surface parameter to d3dfmt_p8_init_palette() const. --- dlls/wined3d/surface.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 110e206..f0cfeb4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4245,10 +4245,10 @@ HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_c return WINED3D_OK; } -void d3dfmt_p8_init_palette(struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) +void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) { - struct wined3d_device *device = surface->resource.device; - struct wined3d_palette *pal = surface->palette; + const struct wined3d_device *device = surface->resource.device; + const struct wined3d_palette *pal = surface->palette; BOOL index_in_alpha = FALSE; unsigned int i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c2cb075..ca852ee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2162,7 +2162,7 @@ typedef enum { HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format *format, CONVERT_TYPES *convert) DECLSPEC_HIDDEN; -void d3dfmt_p8_init_palette(struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN; +void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN; BOOL palette9_changed(struct wined3d_surface *surface) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the device parameter to primary_render_target_is_p8() const.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 3e9930f307c689daa0792a75152e2dd89c79a58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9930f307c689daa0792a751… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 01:06:42 2011 +0200 wined3d: Make the device parameter to primary_render_target_is_p8() const. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ce669e1..110e206 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1984,11 +1984,11 @@ void surface_bind(struct wined3d_surface *surface, const struct wined3d_gl_info } /* This function checks if the primary render target uses the 8bit paletted format. */ -static BOOL primary_render_target_is_p8(struct wined3d_device *device) +static BOOL primary_render_target_is_p8(const struct wined3d_device *device) { if (device->fb.render_targets && device->fb.render_targets[0]) { - struct wined3d_surface *render_target = device->fb.render_targets[0]; + const struct wined3d_surface *render_target = device->fb.render_targets[0]; if ((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) && (render_target->resource.format->id == WINED3DFMT_P8_UINT)) return TRUE;

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2011