October 2013 - Wine-Commits

Henri Verbeet : wined3d: Unify constant buffer binding points.
by Alexandre Julliard Oct. 10, 2013

Oct. 10, 2013

Module: wine Branch: master Commit: 3caefc8337cd618cbf77ef76d8242c00e43bb1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3caefc8337cd618cbf77ef76d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 22:57:46 2013 +0200 wined3d: Unify constant buffer binding points. --- dlls/wined3d/device.c | 90 +++++++-------------------------------- dlls/wined3d/stateblock.c | 32 +++----------- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 24 insertions(+), 102 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 166c84b..55c54f0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2086,20 +2086,19 @@ struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wine return device->state.shader[WINED3D_SHADER_TYPE_VERTEX]; } -void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) +static void wined3d_device_set_constant_buffer(struct wined3d_device *device, + enum wined3d_shader_type type, UINT idx, struct wined3d_buffer *buffer) { struct wined3d_buffer *prev; - TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); - if (idx >= MAX_CONSTANT_BUFFERS) { WARN("Invalid constant buffer index %u.\n", idx); return; } - prev = device->update_state->vs_cb[idx]; - device->update_state->vs_cb[idx] = buffer; + prev = device->update_state->cb[type][idx]; + device->update_state->cb[type][idx] = buffer; if (device->recording) { @@ -2125,6 +2124,13 @@ void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, str } } +void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) +{ + TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); + + wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_VERTEX, idx, buffer); +} + struct wined3d_buffer * CDECL wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx) { TRACE("device %p, idx %u.\n", device, idx); @@ -2135,7 +2141,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_vs_cb(const struct wined3d_devi return NULL; } - return device->state.vs_cb[idx]; + return device->state.cb[WINED3D_SHADER_TYPE_VERTEX][idx]; } void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) @@ -2356,41 +2362,9 @@ struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined void CDECL wined3d_device_set_ps_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) { - struct wined3d_buffer *prev; - TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); - if (idx >= MAX_CONSTANT_BUFFERS) - { - WARN("Invalid constant buffer index %u.\n", idx); - return; - } - - prev = device->update_state->ps_cb[idx]; - device->update_state->ps_cb[idx] = buffer; - - if (device->recording) - { - if (buffer) - wined3d_buffer_incref(buffer); - if (prev) - wined3d_buffer_decref(prev); - return; - } - - if (prev != buffer) - { - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); - wined3d_buffer_incref(buffer); - } - if (prev) - { - InterlockedDecrement(&prev->resource.bind_count); - wined3d_buffer_decref(prev); - } - } + wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_PIXEL, idx, buffer); } struct wined3d_buffer * CDECL wined3d_device_get_ps_cb(const struct wined3d_device *device, UINT idx) @@ -2403,7 +2377,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_ps_cb(const struct wined3d_devi return NULL; } - return device->state.ps_cb[idx]; + return device->state.cb[WINED3D_SHADER_TYPE_PIXEL][idx]; } void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) @@ -2609,41 +2583,9 @@ struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wi void CDECL wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) { - struct wined3d_buffer *prev; - TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); - if (idx >= MAX_CONSTANT_BUFFERS) - { - WARN("Invalid constant buffer index %u.\n", idx); - return; - } - - prev = device->update_state->gs_cb[idx]; - device->update_state->gs_cb[idx] = buffer; - - if (device->recording) - { - if (buffer) - wined3d_buffer_incref(buffer); - if (prev) - wined3d_buffer_decref(prev); - return; - } - - if (prev != buffer) - { - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); - wined3d_buffer_incref(buffer); - } - if (prev) - { - InterlockedDecrement(&prev->resource.bind_count); - wined3d_buffer_decref(prev); - } - } + wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_GEOMETRY, idx, buffer); } struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_device *device, UINT idx) @@ -2656,7 +2598,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_devi return NULL; } - return device->state.gs_cb[idx]; + return device->state.cb[WINED3D_SHADER_TYPE_GEOMETRY][idx]; } void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b2aacb3..d88d51d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -463,7 +463,7 @@ void state_unbind_resources(struct wined3d_state *state) struct wined3d_texture *texture; struct wined3d_buffer *buffer; struct wined3d_shader *shader; - unsigned int i; + unsigned int i, j; if ((decl = state->vertex_declaration)) { @@ -511,14 +511,14 @@ void state_unbind_resources(struct wined3d_state *state) state->shader[i] = NULL; wined3d_shader_decref(shader); } - } - for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) - { - if ((buffer = state->vs_cb[i])) + for (j = 0; j < MAX_CONSTANT_BUFFERS; ++j) { - state->vs_cb[i] = NULL; - wined3d_buffer_decref(buffer); + if ((buffer = state->cb[i][j])) + { + state->cb[i][j] = NULL; + wined3d_buffer_decref(buffer); + } } } @@ -531,15 +531,6 @@ void state_unbind_resources(struct wined3d_state *state) } } - for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) - { - if ((buffer = state->gs_cb[i])) - { - state->gs_cb[i] = NULL; - wined3d_buffer_decref(buffer); - } - } - for (i = 0; i < MAX_SAMPLER_OBJECTS; ++i) { if ((sampler = state->gs_sampler[i])) @@ -557,15 +548,6 @@ void state_unbind_resources(struct wined3d_state *state) wined3d_sampler_decref(sampler); } } - - for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) - { - if ((buffer = state->ps_cb[i])) - { - state->ps_cb[i] = NULL; - wined3d_buffer_decref(buffer); - } - } } void state_cleanup(struct wined3d_state *state) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60dce76..11c1864 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1818,17 +1818,15 @@ struct wined3d_state GLenum gl_primitive_type; struct wined3d_shader *shader[WINED3D_SHADER_TYPE_COUNT]; + struct wined3d_buffer *cb[WINED3D_SHADER_TYPE_COUNT][MAX_CONSTANT_BUFFERS]; - struct wined3d_buffer *vs_cb[MAX_CONSTANT_BUFFERS]; struct wined3d_sampler *vs_sampler[MAX_SAMPLER_OBJECTS]; BOOL vs_consts_b[MAX_CONST_B]; INT vs_consts_i[MAX_CONST_I * 4]; float *vs_consts_f; - struct wined3d_buffer *gs_cb[MAX_CONSTANT_BUFFERS]; struct wined3d_sampler *gs_sampler[MAX_SAMPLER_OBJECTS]; - struct wined3d_buffer *ps_cb[MAX_CONSTANT_BUFFERS]; struct wined3d_sampler *ps_sampler[MAX_SAMPLER_OBJECTS]; BOOL ps_consts_b[MAX_CONST_B]; INT ps_consts_i[MAX_CONST_I * 4];

1 0

Frédéric Delanoy : urlmon/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 10, 2013

Oct. 10, 2013

Module: wine Branch: master Commit: 742c2563e5c6797d4718715ec3e8b2046a2fbb9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=742c2563e5c6797d4718715ec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 22:36:44 2013 +0200 urlmon/tests: Use BOOL type where appropriate. --- dlls/urlmon/tests/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 6c34f62..fcc4be6 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1126,7 +1126,7 @@ static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, } if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) { - static int pending = TRUE; + static BOOL pending = TRUE; pending = !pending;

1 0

Frédéric Delanoy : xmllite: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 10, 2013

Oct. 10, 2013

Module: wine Branch: master Commit: 77a26de9759a85b0a8b9e68c6846080b8884105a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a26de9759a85b0a8b9e68c6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 22:36:46 2013 +0200 xmllite: Use BOOL type where appropriate. --- dlls/xmllite/reader.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0a4423c..a216951 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -726,7 +726,7 @@ static void readerinput_grow(xmlreaderinput *readerinput, int length) } } -static inline int readerinput_is_utf8(xmlreaderinput *readerinput) +static inline BOOL readerinput_is_utf8(xmlreaderinput *readerinput) { static char startA[] = {'<','?'}; static char commentA[] = {'<','!'}; @@ -953,7 +953,7 @@ static void reader_skipn(xmlreader *reader, int n) } } -static inline int is_wchar_space(WCHAR ch) +static inline BOOL is_wchar_space(WCHAR ch) { return ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n'; } @@ -1055,7 +1055,7 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) } /* ([A-Za-z0-9._] | '-') */ -static inline int is_wchar_encname(WCHAR ch) +static inline BOOL is_wchar_encname(WCHAR ch) { return ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') || @@ -1269,7 +1269,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) } /* [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] */ -static inline int is_char(WCHAR ch) +static inline BOOL is_char(WCHAR ch) { return (ch == '\t') || (ch == '\r') || (ch == '\n') || (ch >= 0x20 && ch <= 0xd7ff) || @@ -1279,7 +1279,7 @@ static inline int is_char(WCHAR ch) } /* [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%] */ -static inline int is_pubchar(WCHAR ch) +static inline BOOL is_pubchar(WCHAR ch) { return (ch == ' ') || (ch >= 'a' && ch <= 'z') || @@ -1292,7 +1292,7 @@ static inline int is_pubchar(WCHAR ch) (ch == '_') || (ch == '\r') || (ch == '\n'); } -static inline int is_namestartchar(WCHAR ch) +static inline BOOL is_namestartchar(WCHAR ch) { return (ch == ':') || (ch >= 'A' && ch <= 'Z') || (ch == '_') || (ch >= 'a' && ch <= 'z') || @@ -1312,7 +1312,7 @@ static inline int is_namestartchar(WCHAR ch) } /* [4 NS] NCName ::= Name - (Char* ':' Char*) */ -static inline int is_ncnamechar(WCHAR ch) +static inline BOOL is_ncnamechar(WCHAR ch) { return (ch >= 'A' && ch <= 'Z') || (ch == '_') || (ch >= 'a' && ch <= 'z') || @@ -1336,7 +1336,7 @@ static inline int is_ncnamechar(WCHAR ch) (ch >= 0xfdf0 && ch <= 0xfffd); } -static inline int is_namechar(WCHAR ch) +static inline BOOL is_namechar(WCHAR ch) { return (ch == ':') || is_ncnamechar(ch); }

1 0

Nikolay Sivov : xmllite: Correct allocated destination buffer size.
by Alexandre Julliard Oct. 9, 2013

Oct. 9, 2013

Module: wine Branch: master Commit: 587398259e184ec7e7d7093ef6ee2564461ff66f URL: http://source.winehq.org/git/wine.git/?a=commit;h=587398259e184ec7e7d7093ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 9 15:38:34 2013 +0400 xmllite: Correct allocated destination buffer size. --- dlls/xmllite/reader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ebea0b4..0a4423c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -711,11 +711,12 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) return hr; } -/* grows UTF-16 buffer so it has at least 'length' bytes free on return */ +/* grows UTF-16 buffer so it has at least 'length' WCHAR chars free on return */ static void readerinput_grow(xmlreaderinput *readerinput, int length) { encoded_buffer *buffer = &readerinput->buffer->utf16; + length *= sizeof(WCHAR); /* grow if needed, plus 4 bytes to be sure null terminator will fit in */ if (buffer->allocated < buffer->written + length + 4) {

1 0

Nikolay Sivov : xmllite: Fix overwriting of dest buffer when pushing more data to it.
by Alexandre Julliard Oct. 9, 2013

Oct. 9, 2013

Module: wine Branch: master Commit: feda40bbaab360edd09b1a36d75a52894b91bde6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feda40bbaab360edd09b1a36d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 9 15:38:02 2013 +0400 xmllite: Fix overwriting of dest buffer when pushing more data to it. --- dlls/xmllite/reader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ad6544b..ebea0b4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -703,7 +703,7 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) read = 0; hr = ISequentialStream_Read(readerinput->stream, buffer->data + buffer->written, len, &read); - TRACE("requested %d, read %d, ret 0x%08x\n", len, read, hr); + TRACE("written=%d, alloc=%d, requested=%d, read=%d, ret=0x%08x\n", buffer->written, buffer->allocated, len, read, hr); readerinput->pending = hr == E_PENDING; if (FAILED(hr)) return hr; buffer->written += read; @@ -903,14 +903,14 @@ static HRESULT reader_more(xmlreader *reader) if (cp == ~0) { readerinput_grow(readerinput, len); - memcpy(dest->data, src->data + src->cur, len); + memcpy(dest->data + dest->written, src->data + src->cur, len); dest->written += len*sizeof(WCHAR); return hr; } dest_len = MultiByteToWideChar(cp, 0, src->data + src->cur, len, NULL, 0); readerinput_grow(readerinput, dest_len); - ptr = (WCHAR*)dest->data; + ptr = (WCHAR*)(dest->data + dest->written); MultiByteToWideChar(cp, 0, src->data + src->cur, len, ptr, dest_len); ptr[dest_len] = 0; dest->written += dest_len*sizeof(WCHAR); @@ -930,7 +930,7 @@ static inline WCHAR *reader_get_ptr(xmlreader *reader) encoded_buffer *buffer = &reader->input->buffer->utf16; WCHAR *ptr = (WCHAR*)buffer->data + buffer->cur; if (!*ptr) reader_more(reader); - return ptr; + return (WCHAR*)buffer->data + buffer->cur; } static int reader_cmp(xmlreader *reader, const WCHAR *str)

1 0

Alexandre Julliard : ntdll: Add defines for the file position magic constants.
by Alexandre Julliard Oct. 9, 2013

Oct. 9, 2013

Module: wine Branch: master Commit: ac519d0eeab3eeec3f95db8aaf62b82811ee2670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac519d0eeab3eeec3f95db8aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 9 16:13:41 2013 +0200 ntdll: Add defines for the file position magic constants. --- dlls/ntdll/file.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 94845fa..e747e8f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -95,6 +95,9 @@ mode_t FILE_umask = 0; #define SECSPERDAY 86400 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) +#define FILE_WRITE_TO_END_OF_FILE ((LONGLONG)-1) +#define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) + static const WCHAR ntfsW[] = {'N','T','F','S'}; /************************************************************************** @@ -614,7 +617,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } - if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) { /* async I/O doesn't make sense on regular files */ while ((result = pread( unix_handle, buffer, length, offset->QuadPart )) == -1) @@ -816,7 +819,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap while (length) { - if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pread( unix_handle, (char *)segments->Buffer + pos, page_size - pos, offset->QuadPart + total ); else @@ -981,7 +984,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (type == FD_TYPE_FILE) { if (async_write && - (!offset || (offset->QuadPart < 0 && offset->QuadPart != (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */))) + (!offset || (offset->QuadPart < 0 && offset->QuadPart != FILE_WRITE_TO_END_OF_FILE))) { status = STATUS_INVALID_PARAMETER; goto done; @@ -989,15 +992,15 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (append_write) { - offset_eof.QuadPart = (LONGLONG)-1; /* FILE_WRITE_TO_END_OF_FILE */ + offset_eof.QuadPart = FILE_WRITE_TO_END_OF_FILE; offset = &offset_eof; } - if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) { off_t off = offset->QuadPart; - if (offset->QuadPart == (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */) + if (offset->QuadPart == FILE_WRITE_TO_END_OF_FILE) { struct stat st; @@ -1037,7 +1040,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, else if (type == FD_TYPE_SERIAL) { if (async_write && - (!offset || (offset->QuadPart < 0 && offset->QuadPart != (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */))) + (!offset || (offset->QuadPart < 0 && offset->QuadPart != FILE_WRITE_TO_END_OF_FILE))) { status = STATUS_INVALID_PARAMETER; goto done; @@ -1200,7 +1203,7 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap while (length) { - if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pwrite( unix_handle, (char *)segments->Buffer + pos, page_size - pos, offset->QuadPart + total ); else

1 0

Stefan Dösinger : wined3d: Move sRGB_decode handling to the top of texture_bind / preload.
by Alexandre Julliard Oct. 9, 2013

Oct. 9, 2013

Module: wine Branch: master Commit: 86d63f1d5ac27a44c5b0a5ae8bf3799c2d75bc48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d63f1d5ac27a44c5b0a5ae8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 9 12:38:00 2013 +0200 wined3d: Move sRGB_decode handling to the top of texture_bind / preload. --- dlls/wined3d/texture.c | 27 ++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 5 ++--- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0f3c470..69e7010 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -154,13 +154,16 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, TRACE("texture %p, context %p, srgb %#x, set_surface_desc %p.\n", texture, context, srgb, set_surface_desc); + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + srgb = FALSE; + /* sRGB mode cache for preload() calls outside drawprim. */ if (srgb) texture->flags |= WINED3D_TEXTURE_IS_SRGB; else texture->flags &= ~WINED3D_TEXTURE_IS_SRGB; - gl_tex = wined3d_texture_get_gl_texture(texture, context->gl_info, srgb); + gl_tex = wined3d_texture_get_gl_texture(texture, srgb); target = texture->target; /* Generate a texture name if we don't already have one. */ @@ -282,8 +285,7 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, TRACE("texture %p, sampler_states %p.\n", texture, sampler_states); - gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, - texture->flags & WINED3D_TEXTURE_IS_SRGB); + gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); /* This function relies on the correct texture being bound and loaded. */ @@ -612,12 +614,11 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, if (set_gl_texture_desc && SUCCEEDED(hr)) { UINT sub_count = texture->level_count * texture->layer_count; - BOOL srgb_tex = !context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - && (texture->flags & WINED3D_TEXTURE_IS_SRGB); + BOOL srgb_tex = texture->flags & WINED3D_TEXTURE_IS_SRGB; struct gl_texture *gl_tex; UINT i; - gl_tex = wined3d_texture_get_gl_texture(texture, context->gl_info, srgb_tex); + gl_tex = wined3d_texture_get_gl_texture(texture, srgb_tex); for (i = 0; i < sub_count; ++i) { @@ -658,7 +659,6 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3DSRGB srgb) { - const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; switch (srgb) { case SRGB_RGB: @@ -668,8 +668,7 @@ static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3 return TRUE; default: - return !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - && texture->flags & WINED3D_TEXTURE_IS_SRGB; + return texture->flags & WINED3D_TEXTURE_IS_SRGB; } } @@ -685,8 +684,11 @@ static void texture2d_preload(struct wined3d_texture *texture, TRACE("texture %p, srgb %#x.\n", texture, srgb); + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + srgb = SRGB_RGB; + srgb_mode = texture_srgb_mode(texture, srgb); - if (srgb_mode && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + if (srgb_mode) flag = WINED3D_TEXTURE_SRGB_VALID; else flag = WINED3D_TEXTURE_RGB_VALID; @@ -1058,8 +1060,11 @@ static void texture3d_preload(struct wined3d_texture *texture, TRACE("texture %p, srgb %#x.\n", texture, srgb); + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + srgb = SRGB_RGB; + srgb_mode = texture_srgb_mode(texture, srgb); - if (srgb_mode && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + if (srgb_mode) flag = WINED3D_TEXTURE_SRGB_VALID; else flag = WINED3D_TEXTURE_RGB_VALID; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09aa7a4..14cc378 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2102,10 +2102,9 @@ static inline struct wined3d_texture *wined3d_texture_from_resource(struct wined } static inline struct gl_texture *wined3d_texture_get_gl_texture(struct wined3d_texture *texture, - const struct wined3d_gl_info *gl_info, BOOL srgb) + BOOL srgb) { - return srgb && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - ? &texture->texture_srgb : &texture->texture_rgb; + return srgb ? &texture->texture_srgb : &texture->texture_rgb; } void wined3d_texture_apply_state_changes(struct wined3d_texture *texture,

1 0

Stefan Dösinger : wined3d: Remove sRGB_decode handling from surface_load_location.
by Alexandre Julliard Oct. 9, 2013

Oct. 9, 2013

Module: wine Branch: master Commit: db852ff5b5d954308274d75bac670bfb46c4122f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db852ff5b5d954308274d75ba… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 9 12:37:59 2013 +0200 wined3d: Remove sRGB_decode handling from surface_load_location. --- dlls/wined3d/surface.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 860296b..daa26e2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5600,9 +5600,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c } } - if (location == SFLAG_INSRGBTEX && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - location = SFLAG_INTEXTURE; - if (surface->flags & location) { TRACE("Location already up to date.\n"); @@ -5663,12 +5660,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c surface_evict_sysmem(surface); } - if (surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX) - && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - { - surface->flags |= (SFLAG_INTEXTURE | SFLAG_INSRGBTEX); - } - return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Take sRGB_decode into account in texture_srgb_mode.
by Alexandre Julliard Oct. 9, 2013

Oct. 9, 2013

Module: wine Branch: master Commit: 16f7c24296f2fbcfa7d8a18bf0f0a00c340d3e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f7c24296f2fbcfa7d8a18bf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 9 12:37:58 2013 +0200 wined3d: Take sRGB_decode into account in texture_srgb_mode. --- dlls/wined3d/texture.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 56d13f6..0f3c470 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -658,6 +658,7 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3DSRGB srgb) { + const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; switch (srgb) { case SRGB_RGB: @@ -667,7 +668,8 @@ static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3 return TRUE; default: - return texture->flags & WINED3D_TEXTURE_IS_SRGB; + return !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] + && texture->flags & WINED3D_TEXTURE_IS_SRGB; } }

1 0

Henri Verbeet : d3drm: Introduce impl_from_IDirect3DRMVisualArray().
by Alexandre Julliard Oct. 9, 2013

Oct. 9, 2013

Module: wine Branch: master Commit: 44f5d4bd645c6e76202981c0c3717024f0b888e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f5d4bd645c6e76202981c0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 10:39:40 2013 +0200 d3drm: Introduce impl_from_IDirect3DRMVisualArray(). --- dlls/d3drm/frame.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 4d8867e..7523eab 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -92,6 +92,11 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface); +static inline IDirect3DRMVisualArrayImpl *impl_from_IDirect3DRMVisualArray(IDirect3DRMVisualArray *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DRMVisualArrayImpl, IDirect3DRMVisualArray_iface); +} + static inline struct d3drm_light_array *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface) { return CONTAINING_RECORD(iface, struct d3drm_light_array, IDirect3DRMLightArray_iface); @@ -235,7 +240,7 @@ static HRESULT WINAPI IDirect3DRMVisualArrayImpl_QueryInterface(IDirect3DRMVisua static ULONG WINAPI IDirect3DRMVisualArrayImpl_AddRef(IDirect3DRMVisualArray* iface) { - IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p)->(): new ref = %u\n", iface, ref); @@ -245,7 +250,7 @@ static ULONG WINAPI IDirect3DRMVisualArrayImpl_AddRef(IDirect3DRMVisualArray* if static ULONG WINAPI IDirect3DRMVisualArrayImpl_Release(IDirect3DRMVisualArray* iface) { - IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface); ULONG ref = InterlockedDecrement(&This->ref); ULONG i; @@ -265,7 +270,7 @@ static ULONG WINAPI IDirect3DRMVisualArrayImpl_Release(IDirect3DRMVisualArray* i /*** IDirect3DRMArray methods ***/ static DWORD WINAPI IDirect3DRMVisualArrayImpl_GetSize(IDirect3DRMVisualArray* iface) { - IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface); TRACE("(%p)->() = %d\n", iface, This->size); @@ -276,7 +281,7 @@ static DWORD WINAPI IDirect3DRMVisualArrayImpl_GetSize(IDirect3DRMVisualArray* i static HRESULT WINAPI IDirect3DRMVisualArrayImpl_GetElement(IDirect3DRMVisualArray *iface, DWORD index, IDirect3DRMVisual **visual) { - IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface); TRACE("(%p)->(%u, %p)\n", iface, index, visual);

1 0