mirror of
https://github.com/reactos/reactos.git
synced 2024-09-19 01:00:51 +00:00
489e520163
This patch fixes vertex processing issue of bug 33770. The problem comes from the fact that even if the call succeeds, the game interprets a non null error_messages pointer as an error. By calling D3DCompile we use a newer version of the compiler which is more strict and generates the following warning. - warning X3206: 'dot': implicit truncation of vector type - warning X3206: implicit truncation of vector type - warning X3206: 'mul': implicit truncation of vector type D3DCompileShader does not generate such warnings. These is confirmed in the DX SDK release note: New Warning X3206: Implicit Truncation of Vector Type Beginning in the August 2009 release of the DirectX SDK, the compiler will warn when an implicit truncation of a vector type occurs. The warnings cannot be disable so this patch filters out these strings in D3DCompileShader and reset the error messages pointer if the resulting buffer is empty. Try 2: - only filter out lines containing "X3206:" in case d3dcompiler_43 has localization Try 3: - use move in place instead of copying the buffer Try 4: - filter simplification by Sebastian and remove 'mul' testing left-out in search string wine-staging patch by Christian Costa <titan.costa@gmail.com>
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
diff --git a/dll/directx/wine/d3dx9_36/shader.c b/dll/directx/wine/d3dx9_36/shader.c
|
|
index 1c6acc8..3e0d922 100644
|
|
--- a/dll/directx/wine/d3dx9_36/shader.c
|
|
+++ b/dll/directx/wine/d3dx9_36/shader.c
|
|
@@ -441,6 +441,41 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO
|
|
}
|
|
}
|
|
|
|
+ /* Filter out D3DCompile warning messages that are not present with D3DCompileShader */
|
|
+ if (SUCCEEDED(hr) && error_msgs && *error_msgs)
|
|
+ {
|
|
+ char *messages = ID3DXBuffer_GetBufferPointer(*error_msgs);
|
|
+ DWORD size = ID3DXBuffer_GetBufferSize(*error_msgs);
|
|
+
|
|
+ /* Ensure messages are null terminated for safe processing */
|
|
+ if (size) messages[size - 1] = 0;
|
|
+
|
|
+ while (size > 1)
|
|
+ {
|
|
+ char *prev, *next;
|
|
+
|
|
+ /* Warning has the form "warning X3206: ... implicit truncation of vector type"
|
|
+ but we only search for "X3206:" in case d3dcompiler_43 has localization */
|
|
+ prev = next = strstr(messages, "X3206:");
|
|
+ if (!prev) break;
|
|
+
|
|
+ /* get pointer to beginning and end of current line */
|
|
+ while (prev > messages && *(prev - 1) != '\n') prev--;
|
|
+ while (next < messages + size - 1 && *next != '\n') next++;
|
|
+ if (next < messages + size - 1 && *next == '\n') next++;
|
|
+
|
|
+ memmove(prev, next, messages + size - next);
|
|
+ size -= (next - prev);
|
|
+ }
|
|
+
|
|
+ /* Only return a buffer if the resulting string is not empty as some apps depend on that */
|
|
+ if (size <= 1)
|
|
+ {
|
|
+ ID3DXBuffer_Release(*error_msgs);
|
|
+ *error_msgs = NULL;
|
|
+ }
|
|
+ }
|
|
+
|
|
return hr;
|
|
}
|
|
|