wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Rob Shearman : rpcrt4: Add a Win32 implementation of ncacn_ip_tcp transport .
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 324b4d0243c6fbcd4a8e7cd95d00a610180cb0cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=324b4d0243c6fbcd4a8e7cd95… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Apr 8 12:55:38 2009 +0100 rpcrt4: Add a Win32 implementation of ncacn_ip_tcp transport. --- dlls/rpcrt4/rpc_transport.c | 218 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 204 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 98602d2..390a7d4 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -912,7 +912,12 @@ typedef struct _RpcConnection_tcp { RpcConnection common; int sock; +#ifdef HAVE_SOCKETPAIR int cancel_fds[2]; +#else + HANDLE sock_event; + HANDLE cancel_event; +#endif } RpcConnection_tcp; #ifdef HAVE_SOCKETPAIR @@ -978,30 +983,78 @@ static void rpcrt4_sock_wait_destroy(RpcConnection_tcp *tcpc) static BOOL rpcrt4_sock_wait_init(RpcConnection_tcp *tcpc) { - /* FIXME */ - return FALSE; + static BOOL wsa_inited; + if (!wsa_inited) + { + WSADATA wsadata; + WSAStartup(MAKEWORD(2, 2), &wsadata); + /* Note: WSAStartup can be called more than once so we don't bother with + * making accesses to wsa_inited thread-safe */ + wsa_inited = TRUE; + } + tcpc->sock_event = CreateEventW(NULL, FALSE, FALSE, NULL); + tcpc->cancel_event = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!tcpc->sock_event || !tcpc->cancel_event) + { + ERR("event creation failed\n"); + if (tcpc->sock_event) CloseHandle(tcpc->sock_event); + return FALSE; + } + return TRUE; } static BOOL rpcrt4_sock_wait_for_recv(RpcConnection_tcp *tcpc) { - /* FIXME */ - return FALSE; + HANDLE wait_handles[2]; + DWORD res; + if (WSAEventSelect(tcpc->sock, tcpc->sock_event, FD_READ | FD_CLOSE) == SOCKET_ERROR) + { + ERR("WSAEventSelect() failed with error %d\n", WSAGetLastError()); + return FALSE; + } + wait_handles[0] = tcpc->sock_event; + wait_handles[1] = tcpc->cancel_event; + res = WaitForMultipleObjects(2, wait_handles, FALSE, INFINITE); + switch (res) + { + case WAIT_OBJECT_0: + return TRUE; + case WAIT_OBJECT_0 + 1: + return FALSE; + default: + ERR("WaitForMultipleObjects() failed with error %d\n", GetLastError()); + return FALSE; + } } static BOOL rpcrt4_sock_wait_for_send(RpcConnection_tcp *tcpc) { - /* FIXME */ - return FALSE; + DWORD res; + if (WSAEventSelect(tcpc->sock, tcpc->sock_event, FD_WRITE | FD_CLOSE) == SOCKET_ERROR) + { + ERR("WSAEventSelect() failed with error %d\n", WSAGetLastError()); + return FALSE; + } + res = WaitForSingleObject(tcpc->sock_event, INFINITE); + switch (res) + { + case WAIT_OBJECT_0: + return TRUE; + default: + ERR("WaitForMultipleObjects() failed with error %d\n", GetLastError()); + return FALSE; + } } static void rpcrt4_sock_wait_cancel(RpcConnection_tcp *tcpc) { - /* FIXME */ + SetEvent(tcpc->cancel_event); } static void rpcrt4_sock_wait_destroy(RpcConnection_tcp *tcpc) { - /* FIXME */ + CloseHandle(tcpc->sock_event); + CloseHandle(tcpc->cancel_event); } #endif @@ -1105,8 +1158,6 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) return RPC_S_SERVER_UNAVAILABLE; } -#ifdef HAVE_SOCKETPAIR - static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *protseq, const char *endpoint) { RPC_STATUS status = RPC_S_CANT_CREATE_ENDPOINT; @@ -1266,8 +1317,6 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr return status; } -#endif - static RPC_STATUS rpcrt4_conn_tcp_handoff(RpcConnection *old_conn, RpcConnection *new_conn) { int ret; @@ -1520,6 +1569,149 @@ static int rpcrt4_protseq_sock_wait_for_new_connection(RpcServerProtseq *protseq return 1; } +#else /* HAVE_SOCKETPAIR */ + +typedef struct _RpcServerProtseq_sock +{ + RpcServerProtseq common; + HANDLE mgr_event; +} RpcServerProtseq_sock; + +static RpcServerProtseq *rpcrt4_protseq_sock_alloc(void) +{ + RpcServerProtseq_sock *ps = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps)); + if (ps) + { + static BOOL wsa_inited; + if (!wsa_inited) + { + WSADATA wsadata; + WSAStartup(MAKEWORD(2, 2), &wsadata); + /* Note: WSAStartup can be called more than once so we don't bother with + * making accesses to wsa_inited thread-safe */ + wsa_inited = TRUE; + } + ps->mgr_event = CreateEventW(NULL, FALSE, FALSE, NULL); + } + return &ps->common; +} + +static void rpcrt4_protseq_sock_signal_state_changed(RpcServerProtseq *protseq) +{ + RpcServerProtseq_sock *sockps = CONTAINING_RECORD(protseq, RpcServerProtseq_sock, common); + SetEvent(sockps->mgr_event); +} + +static void *rpcrt4_protseq_sock_get_wait_array(RpcServerProtseq *protseq, void *prev_array, unsigned int *count) +{ + HANDLE *objs = prev_array; + RpcConnection_tcp *conn; + RpcServerProtseq_sock *sockps = CONTAINING_RECORD(protseq, RpcServerProtseq_sock, common); + + EnterCriticalSection(&protseq->cs); + + /* open and count connections */ + *count = 1; + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_tcp, common); + while (conn) + { + if (conn->sock != -1) + (*count)++; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_tcp, common); + } + + /* make array of connections */ + if (objs) + objs = HeapReAlloc(GetProcessHeap(), 0, objs, *count*sizeof(HANDLE)); + else + objs = HeapAlloc(GetProcessHeap(), 0, *count*sizeof(HANDLE)); + if (!objs) + { + ERR("couldn't allocate objs\n"); + LeaveCriticalSection(&protseq->cs); + return NULL; + } + + objs[0] = sockps->mgr_event; + *count = 1; + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_tcp, common); + while (conn) + { + if (conn->sock != -1) + { + int res = WSAEventSelect(conn->sock, conn->sock_event, FD_ACCEPT); + if (res == SOCKET_ERROR) + ERR("WSAEventSelect() failed with error %d\n", WSAGetLastError()); + else + { + objs[*count] = conn->sock_event; + (*count)++; + } + } + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_tcp, common); + } + LeaveCriticalSection(&protseq->cs); + return objs; +} + +static void rpcrt4_protseq_sock_free_wait_array(RpcServerProtseq *protseq, void *array) +{ + HeapFree(GetProcessHeap(), 0, array); +} + +static int rpcrt4_protseq_sock_wait_for_new_connection(RpcServerProtseq *protseq, unsigned int count, void *wait_array) +{ + HANDLE b_handle; + HANDLE *objs = wait_array; + DWORD res; + RpcConnection *cconn; + RpcConnection_tcp *conn; + + if (!objs) + return -1; + + do + { + /* an alertable wait isn't strictly necessary, but due to our + * overlapped I/O implementation in Wine we need to free some memory + * by the file user APC being called, even if no completion routine was + * specified at the time of starting the async operation */ + res = WaitForMultipleObjectsEx(count, objs, FALSE, INFINITE, TRUE); + } while (res == WAIT_IO_COMPLETION); + + if (res == WAIT_OBJECT_0) + return 0; + else if (res == WAIT_FAILED) + { + ERR("wait failed with error %d\n", GetLastError()); + return -1; + } + else + { + b_handle = objs[res - WAIT_OBJECT_0]; + /* find which connection got a RPC */ + EnterCriticalSection(&protseq->cs); + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_tcp, common); + while (conn) + { + if (b_handle == conn->sock_event) break; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_tcp, common); + } + cconn = NULL; + if (conn) + RPCRT4_SpawnConnection(&cconn, &conn->common); + else + ERR("failed to locate connection for handle %p\n", b_handle); + LeaveCriticalSection(&protseq->cs); + if (cconn) + { + RPCRT4_new_client(cconn); + return 1; + } + else return -1; + } +} + #endif /* HAVE_SOCKETPAIR */ static RPC_STATUS rpcrt4_ncacn_ip_tcp_parse_top_of_tower(const unsigned char *tower_data, @@ -2551,7 +2743,6 @@ static const struct protseq_ops protseq_list[] = rpcrt4_protseq_np_wait_for_new_connection, rpcrt4_protseq_ncalrpc_open_endpoint, }, -#ifdef HAVE_SOCKETPAIR { "ncacn_ip_tcp", rpcrt4_protseq_sock_alloc, @@ -2561,7 +2752,6 @@ static const struct protseq_ops protseq_list[] = rpcrt4_protseq_sock_wait_for_new_connection, rpcrt4_protseq_ncacn_ip_tcp_open_endpoint, }, -#endif }; #define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0]))

1 0

Rob Shearman : rpcrt4: Factor out non-Win32 compatible parts of the ncacn_ip_tcp client code to allow it to be compiled in .
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 06c2982a39b17b69b8c8c977ffeff3dc7d6c1e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c2982a39b17b69b8c8c977f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Apr 8 12:54:43 2009 +0100 rpcrt4: Factor out non-Win32 compatible parts of the ncacn_ip_tcp client code to allow it to be compiled in. --- dlls/rpcrt4/rpc_transport.c | 183 +++++++++++++++++++++++++++++-------------- 1 files changed, 125 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06c2982a39b17b69b8c8c…

1 0

Alexandre Julliard : fusion: Fix the 32/ 64 PE image format check on 64-bit platforms.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: e2aefee80ead5f53b8368f3dbac4f8d1a4a4dba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2aefee80ead5f53b8368f3db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 8 12:06:35 2009 +0200 fusion: Fix the 32/64 PE image format check on 64-bit platforms. --- dlls/fusion/assembly.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index a7b09c8..faef8ef 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -631,14 +631,18 @@ static HRESULT parse_pe_header(ASSEMBLY *assembly) if (!assembly->nthdr) return E_FAIL; - if (assembly->nthdr->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64) + if (assembly->nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { IMAGE_OPTIONAL_HEADER64 *opthdr = (IMAGE_OPTIONAL_HEADER64 *)&assembly->nthdr->OptionalHeader; datadirs = opthdr->DataDirectory; } else - datadirs = assembly->nthdr->OptionalHeader.DataDirectory; + { + IMAGE_OPTIONAL_HEADER32 *opthdr = + (IMAGE_OPTIONAL_HEADER32 *)&assembly->nthdr->OptionalHeader; + datadirs = opthdr->DataDirectory; + } if (!datadirs) return E_FAIL;

1 0

Alexandre Julliard : fusion/tests: Always use the 32-bit magic in the 32-bit optional header structure.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: bbe70550feacbcb42c3557969f2474d00f5c0a5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe70550feacbcb42c3557969… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 8 12:06:07 2009 +0200 fusion/tests: Always use the 32-bit magic in the 32-bit optional header structure. --- dlls/fusion/tests/asmcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 2fe84ec..06867e6 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -302,7 +302,7 @@ static struct _tagASSEMBLY }, /* IMAGE_OPTIONAL_HEADER32 */ { - IMAGE_NT_OPTIONAL_HDR_MAGIC, /* Magic */ + IMAGE_NT_OPTIONAL_HDR32_MAGIC, /* Magic */ 8, /* MajorLinkerVersion */ 0, /* MinorLinkerVersion */ 0x400, /* SizeOfCode */

1 0

Alexandre Julliard : fusion: Use the correct cache path on Win64.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 0baf5aa0005b6977f897fc5024605a729f497e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0baf5aa0005b6977f897fc502… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 8 11:50:33 2009 +0200 fusion: Use the correct cache path on Win64. --- dlls/fusion/fusion.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index 5975d43..1435743 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -117,8 +117,11 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, static const WCHAR gac[] = {'G','A','C',0}; static const WCHAR nativeimg[] = { 'N','a','t','i','v','e','I','m','a','g','e','s','_',0}; - static const WCHAR zapfmt[] = { - '%','s','\\','%','s','\\','%','s','%','s','_','3','2',0}; +#ifdef _WIN64 + static const WCHAR zapfmt[] = {'%','s','\\','%','s','\\','%','s','%','s','_','6','4',0}; +#else + static const WCHAR zapfmt[] = {'%','s','\\','%','s','\\','%','s','%','s','_','3','2',0}; +#endif TRACE("(%08x, %p, %p)\n", dwCacheFlags, pwzCachePath, pcchPath);

1 0

Henri Verbeet : wined3d: Eliminate a useless local variable.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 2df49ea8ef1efe591c94797a3da204712fb85ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2df49ea8ef1efe591c94797a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 8 08:35:07 2009 +0200 wined3d: Eliminate a useless local variable. --- dlls/wined3d/glsl_shader.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8ad4175..3301cc2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3251,7 +3251,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs SHADER_BUFFER buffer; DWORD usage, usage_idx, writemask; char reg_mask[6]; - const struct wined3d_shader_semantic *semantics_out, *semantics_in; + const struct wined3d_shader_semantic *semantics_out; shader_buffer_init(&buffer); @@ -3327,7 +3327,6 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs } else if(ps_major >= 3 && vs_major >= 3) { semantics_out = vs->semantics_out; - semantics_in = ps->semantics_in; /* This one is tricky: a 3.0 pixel shader reads from a 3.0 vertex shader */ shader_addline(&buffer, "varying vec4 IN[%u];\n", GL_LIMITS(glsl_varyings) / 4); @@ -3357,19 +3356,17 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs /* Then, fix the pixel shader input */ handle_ps3_input(&buffer, gl_info, ps->input_reg_map, - semantics_in, &ps->baseShader.reg_maps, semantics_out, &vs->baseShader.reg_maps); + ps->semantics_in, &ps->baseShader.reg_maps, semantics_out, &vs->baseShader.reg_maps); shader_addline(&buffer, "}\n"); } else if(ps_major >= 3 && vs_major < 3) { - semantics_in = ps->semantics_in; - shader_addline(&buffer, "varying vec4 IN[%u];\n", GL_LIMITS(glsl_varyings) / 4); shader_addline(&buffer, "void order_ps_input() {\n"); /* The vertex shader wrote to the builtin varyings. There is no need to figure out position and * point size, but we depend on the optimizers kindness to find out that the pixel shader doesn't * read gl_TexCoord and gl_ColorX, otherwise we'll run out of varyings */ - handle_ps3_input(&buffer, gl_info, ps->input_reg_map, semantics_in, &ps->baseShader.reg_maps, NULL, NULL); + handle_ps3_input(&buffer, gl_info, ps->input_reg_map, ps->semantics_in, &ps->baseShader.reg_maps, NULL, NULL); shader_addline(&buffer, "}\n"); } else { ERR("Unexpected vertex and pixel shader version condition: vs: %d, ps: %d\n", vs_major, ps_major);

1 0

Henri Verbeet : wined3d: Store usage and usage_idx in struct wined3d_shader_semantic.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 9ec0b09d35bc747f62b29ee0a1ab34ae8b26873c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec0b09d35bc747f62b29ee0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 8 08:35:07 2009 +0200 wined3d: Store usage and usage_idx in struct wined3d_shader_semantic. Instead of the usage token. --- dlls/wined3d/baseshader.c | 8 ++++++-- dlls/wined3d/glsl_shader.c | 28 ++++++++++------------------ dlls/wined3d/vertexshader.c | 16 ++++------------ dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 22 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a1d1651..c7931ee 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -297,13 +297,17 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m else reg_maps->packed_input[regnum] = 1; - semantics_in[regnum].usage = usage; + semantics_in[regnum].usage = (usage & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + semantics_in[regnum].usage_idx = + (usage & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; shader_parse_dst_param(param, 0, &semantics_in[regnum].reg); /* Vshader: mark 3.0 output registers used, save token */ } else if (WINED3DSPR_OUTPUT == regtype) { reg_maps->packed_output[regnum] = 1; - semantics_out[regnum].usage = usage; + semantics_out[regnum].usage = (usage & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + semantics_out[regnum].usage_idx = + (usage & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; shader_parse_dst_param(param, 0, &semantics_out[regnum].reg); if (usage & (WINED3DDECLUSAGE_FOG << WINED3DSP_DCL_USAGE_SHIFT)) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1edf02b..8ad4175 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3002,16 +3002,14 @@ static void pshader_glsl_input_pack(IWineD3DPixelShader *iface, SHADER_BUFFER *b for (i = 0; i < MAX_REG_INPUT; ++i) { - DWORD usage_token; DWORD usage, usage_idx; char reg_mask[6]; /* Unused */ if (!reg_maps->packed_input[i]) continue; - usage_token = semantics_in[i].usage; - usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + usage = semantics_in[i].usage; + usage_idx = semantics_in[i].usage_idx; shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); switch (usage) @@ -3099,7 +3097,6 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in const struct wined3d_shader_semantic *semantics_out, const struct shader_reg_maps *reg_maps_out) { unsigned int i, j; - DWORD usage_token, usage_token_out; DWORD usage, usage_idx, usage_out, usage_idx_out; DWORD *set; DWORD in_idx; @@ -3137,9 +3134,8 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in sprintf(destination, "IN[%u]", in_idx); } - usage_token = semantics_in[i].usage; - usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + usage = semantics_in[i].usage; + usage_idx = semantics_in[i].usage_idx; set[map[i]] = shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); if(!semantics_out) { @@ -3180,9 +3176,8 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in for(j = 0; j < MAX_REG_OUTPUT; j++) { if (!reg_maps_out->packed_output[j]) continue; - usage_token_out = semantics_out[j].usage; - usage_out = (usage_token_out & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx_out = (usage_token_out & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + usage_out = semantics_out[j].usage; + usage_idx_out = semantics_out[j].usage_idx; shader_glsl_get_write_mask(semantics_out[j].reg.token, reg_mask_out); if(usage == usage_out && @@ -3254,7 +3249,6 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs DWORD ps_major = ps ? WINED3DSHADER_VERSION_MAJOR(ps->baseShader.reg_maps.shader_version) : 0; unsigned int i; SHADER_BUFFER buffer; - DWORD usage_token; DWORD usage, usage_idx, writemask; char reg_mask[6]; const struct wined3d_shader_semantic *semantics_out, *semantics_in; @@ -3289,9 +3283,8 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs for(i = 0; i < MAX_REG_OUTPUT; i++) { if (!vs->baseShader.reg_maps.packed_output[i]) continue; - usage_token = semantics_out[i].usage; - usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + usage = semantics_out[i].usage; + usage_idx = semantics_out[i].usage_idx; writemask = shader_glsl_get_write_mask(semantics_out[i].reg.token, reg_mask); switch(usage) { @@ -3344,9 +3337,8 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs for(i = 0; i < MAX_REG_OUTPUT; i++) { if (!vs->baseShader.reg_maps.packed_output[i]) continue; - usage_token = semantics_out[i].usage; - usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + usage = semantics_out[i].usage; + usage_idx = semantics_out[i].usage_idx; shader_glsl_get_write_mask(semantics_out[i].reg.token, reg_mask); switch(usage) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 5349528..8369251 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -174,15 +174,12 @@ static void vshader_set_input( unsigned int regnum, BYTE usage, BYTE usage_idx) { - /* Fake usage: set reserved bit, usage, usage_idx */ - DWORD usage_token = (0x1 << 31) | - (usage << WINED3DSP_DCL_USAGE_SHIFT) | (usage_idx << WINED3DSP_DCL_USAGEINDEX_SHIFT); - /* Fake register; set reserved bit, regnum, type: input, wmask: all */ DWORD reg_token = (0x1 << 31) | WINED3DSP_WRITEMASK_ALL | (WINED3DSPR_INPUT << WINED3DSP_REGTYPE_SHIFT) | regnum; - This->semantics_in[regnum].usage = usage_token; + This->semantics_in[regnum].usage = usage; + This->semantics_in[regnum].usage_idx = usage_idx; This->semantics_in[regnum].reg.register_type = WINED3DSPR_INPUT; This->semantics_in[regnum].reg.register_idx = regnum; This->semantics_in[regnum].reg.write_mask = WINED3DSP_WRITEMASK_ALL; @@ -209,15 +206,10 @@ BOOL vshader_get_input( int i; for (i = 0; i < MAX_ATTRIBS; i++) { - DWORD usage_token, usage, usage_idx; - if (!This->baseShader.reg_maps.attributes[i]) continue; - usage_token = This->semantics_in[i].usage; - usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - - if (match_usage(usage, usage_idx, usage_req, usage_idx_req)) + if (match_usage(This->semantics_in[i].usage, + This->semantics_in[i].usage_idx, usage_req, usage_idx_req)) { *regnum = i; return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e77702e..59944a4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -472,7 +472,8 @@ struct wined3d_shader_instruction struct wined3d_shader_semantic { - DWORD usage; + WINED3DDECLUSAGE usage; + UINT usage_idx; struct wined3d_shader_dst_param reg; };

1 0

Henri Verbeet : wined3d: Properly check if input/output varyings are used.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: a1dedbdf58feade76a679e9532b5d568c6972439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1dedbdf58feade76a679e953… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 8 08:35:07 2009 +0200 wined3d: Properly check if input/output varyings are used. --- dlls/wined3d/glsl_shader.c | 41 +++++++++++++++++++++++------------------ dlls/wined3d/vertexshader.c | 13 +++++++++---- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 10f1b4f..1edf02b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2993,20 +2993,23 @@ static void pshader_glsl_dp2add(const struct wined3d_shader_instruction *ins) } } -static void pshader_glsl_input_pack(SHADER_BUFFER *buffer, const struct wined3d_shader_semantic *semantics_in, - IWineD3DPixelShader *iface, enum vertexprocessing_mode vertexprocessing) +static void pshader_glsl_input_pack(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer, + const struct wined3d_shader_semantic *semantics_in, const struct shader_reg_maps *reg_maps, + enum vertexprocessing_mode vertexprocessing) { unsigned int i; IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; for (i = 0; i < MAX_REG_INPUT; ++i) { - DWORD usage_token = semantics_in[i].usage; + DWORD usage_token; DWORD usage, usage_idx; char reg_mask[6]; - /* Uninitialized */ - if (!usage_token) continue; + /* Unused */ + if (!reg_maps->packed_input[i]) continue; + + usage_token = semantics_in[i].usage; usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); @@ -3091,8 +3094,9 @@ static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const WineD HeapFree(GetProcessHeap(), 0, entry); } -static void handle_ps3_input(SHADER_BUFFER *buffer, const struct wined3d_shader_semantic *semantics_in, - const struct wined3d_shader_semantic *semantics_out, const WineD3D_GL_Info *gl_info, const DWORD *map) +static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info, const DWORD *map, + const struct wined3d_shader_semantic *semantics_in, const struct shader_reg_maps *reg_maps_in, + const struct wined3d_shader_semantic *semantics_out, const struct shader_reg_maps *reg_maps_out) { unsigned int i, j; DWORD usage_token, usage_token_out; @@ -3112,8 +3116,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const struct wined3d_shader_ } for(i = 0; i < MAX_REG_INPUT; i++) { - usage_token = semantics_in[i].usage; - if (!usage_token) continue; + if (!reg_maps_in->packed_input[i]) continue; in_idx = map[i]; if (in_idx >= (in_count + 2)) { @@ -3134,6 +3137,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const struct wined3d_shader_ sprintf(destination, "IN[%u]", in_idx); } + usage_token = semantics_in[i].usage; usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; set[map[i]] = shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); @@ -3174,9 +3178,9 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const struct wined3d_shader_ } else { BOOL found = FALSE; for(j = 0; j < MAX_REG_OUTPUT; j++) { - usage_token_out = semantics_out[j].usage; - if (!usage_token_out) continue; + if (!reg_maps_out->packed_output[j]) continue; + usage_token_out = semantics_out[j].usage; usage_out = (usage_token_out & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx_out = (usage_token_out & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; shader_glsl_get_write_mask(semantics_out[j].reg.token, reg_mask_out); @@ -3283,9 +3287,9 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs shader_addline(&buffer, "void order_ps_input(in vec4 OUT[%u]) {\n", MAX_REG_OUTPUT); for(i = 0; i < MAX_REG_OUTPUT; i++) { - usage_token = semantics_out[i].usage; - if (!usage_token) continue; + if (!vs->baseShader.reg_maps.packed_output[i]) continue; + usage_token = semantics_out[i].usage; usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; writemask = shader_glsl_get_write_mask(semantics_out[i].reg.token, reg_mask); @@ -3338,9 +3342,9 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs /* First, sort out position and point size. Those are not passed to the pixel shader */ for(i = 0; i < MAX_REG_OUTPUT; i++) { - usage_token = semantics_out[i].usage; - if (!usage_token) continue; + if (!vs->baseShader.reg_maps.packed_output[i]) continue; + usage_token = semantics_out[i].usage; usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; shader_glsl_get_write_mask(semantics_out[i].reg.token, reg_mask); @@ -3360,7 +3364,8 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs } /* Then, fix the pixel shader input */ - handle_ps3_input(&buffer, semantics_in, semantics_out, gl_info, ps->input_reg_map); + handle_ps3_input(&buffer, gl_info, ps->input_reg_map, + semantics_in, &ps->baseShader.reg_maps, semantics_out, &vs->baseShader.reg_maps); shader_addline(&buffer, "}\n"); } else if(ps_major >= 3 && vs_major < 3) { @@ -3372,7 +3377,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs * point size, but we depend on the optimizers kindness to find out that the pixel shader doesn't * read gl_TexCoord and gl_ColorX, otherwise we'll run out of varyings */ - handle_ps3_input(&buffer, semantics_in, NULL, gl_info, ps->input_reg_map); + handle_ps3_input(&buffer, gl_info, ps->input_reg_map, semantics_in, &ps->baseShader.reg_maps, NULL, NULL); shader_addline(&buffer, "}\n"); } else { ERR("Unexpected vertex and pixel shader version condition: vs: %d, ps: %d\n", vs_major, ps_major); @@ -3967,7 +3972,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, SHADER_BU /* Pack 3.0 inputs */ if (reg_maps->shader_version >= WINED3DPS_VERSION(3,0) && args->vp_mode != vertexshader) { - pshader_glsl_input_pack(buffer, This->semantics_in, iface, args->vp_mode); + pshader_glsl_input_pack(iface, buffer, This->semantics_in, reg_maps, args->vp_mode); } /* Base Shader Body */ diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 8f7ce1d..5349528 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -209,11 +209,16 @@ BOOL vshader_get_input( int i; for (i = 0; i < MAX_ATTRIBS; i++) { - DWORD usage_token = This->semantics_in[i].usage; - DWORD usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - DWORD usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + DWORD usage_token, usage, usage_idx; - if (usage_token && match_usage(usage, usage_idx, usage_req, usage_idx_req)) { + if (!This->baseShader.reg_maps.attributes[i]) continue; + + usage_token = This->semantics_in[i].usage; + usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + + if (match_usage(usage, usage_idx, usage_req, usage_idx_req)) + { *regnum = i; return TRUE; }

1 0

Henri Verbeet : wined3d: Fix some more 3 space indentation.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 375780a5a845baaf61bebca165008936372cb66e URL: http://source.winehq.org/git/wine.git/?a=commit;h=375780a5a845baaf61bebca16… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 8 08:35:06 2009 +0200 wined3d: Fix some more 3 space indentation. --- dlls/wined3d/glsl_shader.c | 74 ++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f367e1f..10f1b4f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2996,48 +2996,48 @@ static void pshader_glsl_dp2add(const struct wined3d_shader_instruction *ins) static void pshader_glsl_input_pack(SHADER_BUFFER *buffer, const struct wined3d_shader_semantic *semantics_in, IWineD3DPixelShader *iface, enum vertexprocessing_mode vertexprocessing) { - unsigned int i; - IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *) iface; + unsigned int i; + IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; - for (i = 0; i < MAX_REG_INPUT; i++) { + for (i = 0; i < MAX_REG_INPUT; ++i) + { + DWORD usage_token = semantics_in[i].usage; + DWORD usage, usage_idx; + char reg_mask[6]; - DWORD usage_token = semantics_in[i].usage; - DWORD usage, usage_idx; - char reg_mask[6]; + /* Uninitialized */ + if (!usage_token) continue; + usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); - /* Uninitialized */ - if (!usage_token) continue; - usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); + switch (usage) + { + case WINED3DDECLUSAGE_TEXCOORD: + if (usage_idx < 8 && vertexprocessing == pretransformed) + shader_addline(buffer, "IN[%u]%s = gl_TexCoord[%u]%s;\n", + This->input_reg_map[i], reg_mask, usage_idx, reg_mask); + else + shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", + This->input_reg_map[i], reg_mask, reg_mask); + break; - switch(usage) { + case WINED3DDECLUSAGE_COLOR: + if (usage_idx == 0) + shader_addline(buffer, "IN[%u]%s = vec4(gl_Color)%s;\n", + This->input_reg_map[i], reg_mask, reg_mask); + else if (usage_idx == 1) + shader_addline(buffer, "IN[%u]%s = vec4(gl_SecondaryColor)%s;\n", + This->input_reg_map[i], reg_mask, reg_mask); + else + shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", + This->input_reg_map[i], reg_mask, reg_mask); + break; - case WINED3DDECLUSAGE_TEXCOORD: - if(usage_idx < 8 && vertexprocessing == pretransformed) { - shader_addline(buffer, "IN[%u]%s = gl_TexCoord[%u]%s;\n", - This->input_reg_map[i], reg_mask, usage_idx, reg_mask); - } else { - shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", - This->input_reg_map[i], reg_mask, reg_mask); - } - break; - - case WINED3DDECLUSAGE_COLOR: - if (usage_idx == 0) - shader_addline(buffer, "IN[%u]%s = vec4(gl_Color)%s;\n", - This->input_reg_map[i], reg_mask, reg_mask); - else if (usage_idx == 1) - shader_addline(buffer, "IN[%u]%s = vec4(gl_SecondaryColor)%s;\n", - This->input_reg_map[i], reg_mask, reg_mask); - else - shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", - This->input_reg_map[i], reg_mask, reg_mask); - break; - - default: - shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", - This->input_reg_map[i], reg_mask, reg_mask); + default: + shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", + This->input_reg_map[i], reg_mask, reg_mask); + break; } } }

1 0

Henri Verbeet : wined3d: Store a struct wined3d_shader_dst_param in struct wined3d_shader_semantic.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: d12e489272fe0bfbcc1a31a9ea537e9db05315f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12e489272fe0bfbcc1a31a9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 8 08:35:06 2009 +0200 wined3d: Store a struct wined3d_shader_dst_param in struct wined3d_shader_semantic. --- dlls/wined3d/baseshader.c | 29 +++++++++++++++++++---------- dlls/wined3d/glsl_shader.c | 26 +++++++++----------------- dlls/wined3d/vertexshader.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 21 +++++++++++---------- 4 files changed, 45 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d12e489272fe0bfbcc1a3…

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
67
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 April 2009