diff --git a/patches/d3dx9_36-GetShaderSemantics/0001-d3dx9_36-Implement-D3DXGetShaderInputSemantics-tests.patch b/patches/d3dx9_36-GetShaderSemantics/0001-d3dx9_36-Implement-D3DXGetShaderInputSemantics-tests.patch index 21e77af0..7976bdcf 100644 --- a/patches/d3dx9_36-GetShaderSemantics/0001-d3dx9_36-Implement-D3DXGetShaderInputSemantics-tests.patch +++ b/patches/d3dx9_36-GetShaderSemantics/0001-d3dx9_36-Implement-D3DXGetShaderInputSemantics-tests.patch @@ -1,18 +1,193 @@ -From 112abf989d718eb45388793f138d115eeda5b921 Mon Sep 17 00:00:00 2001 +From f6450f50915fa8aa93983cb736015c4eb2d1bf97 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Sat, 5 Apr 2014 14:02:07 +0200 Subject: d3dx9_36: Implement D3DXGetShaderInputSemantics + tests. (rev 3) Fixes bug 22682. --- + dlls/d3dx9_24/d3dx9_24.spec | 2 +- + dlls/d3dx9_25/d3dx9_25.spec | 2 +- + dlls/d3dx9_26/d3dx9_26.spec | 2 +- + dlls/d3dx9_27/d3dx9_27.spec | 2 +- + dlls/d3dx9_28/d3dx9_28.spec | 2 +- + dlls/d3dx9_29/d3dx9_29.spec | 2 +- + dlls/d3dx9_30/d3dx9_30.spec | 2 +- + dlls/d3dx9_31/d3dx9_31.spec | 2 +- + dlls/d3dx9_32/d3dx9_32.spec | 2 +- + dlls/d3dx9_33/d3dx9_33.spec | 2 +- + dlls/d3dx9_34/d3dx9_34.spec | 2 +- + dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 93 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/shader.c | 86 ++++++++++++++++++++++++++++++++++++++++ + dlls/d3dx9_37/d3dx9_37.spec | 2 +- + dlls/d3dx9_38/d3dx9_38.spec | 2 +- + dlls/d3dx9_39/d3dx9_39.spec | 2 +- + dlls/d3dx9_40/d3dx9_40.spec | 2 +- + dlls/d3dx9_41/d3dx9_41.spec | 2 +- + dlls/d3dx9_42/d3dx9_42.spec | 2 +- + dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9shader.h | 1 + - 4 files changed, 181 insertions(+), 1 deletion(-) + 23 files changed, 200 insertions(+), 20 deletions(-) +diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec +index 88ad9af..7e4217d 100644 +--- a/dlls/d3dx9_24/d3dx9_24.spec ++++ b/dlls/d3dx9_24/d3dx9_24.spec +@@ -154,7 +154,7 @@ + @ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec +index fc64fb4..2c7ae49 100644 +--- a/dlls/d3dx9_25/d3dx9_25.spec ++++ b/dlls/d3dx9_25/d3dx9_25.spec +@@ -154,7 +154,7 @@ + @ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec +index 5bcf2cc..21b7f3c 100644 +--- a/dlls/d3dx9_26/d3dx9_26.spec ++++ b/dlls/d3dx9_26/d3dx9_26.spec +@@ -158,7 +158,7 @@ + @ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec +index 5bcf2cc..21b7f3c 100644 +--- a/dlls/d3dx9_27/d3dx9_27.spec ++++ b/dlls/d3dx9_27/d3dx9_27.spec +@@ -158,7 +158,7 @@ + @ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec +index edb494e..5f630a6 100644 +--- a/dlls/d3dx9_28/d3dx9_28.spec ++++ b/dlls/d3dx9_28/d3dx9_28.spec +@@ -158,7 +158,7 @@ + @ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec +index edb494e..5f630a6 100644 +--- a/dlls/d3dx9_29/d3dx9_29.spec ++++ b/dlls/d3dx9_29/d3dx9_29.spec +@@ -158,7 +158,7 @@ + @ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec +index dc00086..5f0e3a4 100644 +--- a/dlls/d3dx9_30/d3dx9_30.spec ++++ b/dlls/d3dx9_30/d3dx9_30.spec +@@ -158,7 +158,7 @@ + @ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec +index c650a77..1d52ecb 100644 +--- a/dlls/d3dx9_31/d3dx9_31.spec ++++ b/dlls/d3dx9_31/d3dx9_31.spec +@@ -157,7 +157,7 @@ + @ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec +index 8c2fe78..4333519 100644 +--- a/dlls/d3dx9_32/d3dx9_32.spec ++++ b/dlls/d3dx9_32/d3dx9_32.spec +@@ -157,7 +157,7 @@ + @ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec +index 8c2fe78..4333519 100644 +--- a/dlls/d3dx9_33/d3dx9_33.spec ++++ b/dlls/d3dx9_33/d3dx9_33.spec +@@ -157,7 +157,7 @@ + @ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec +index 8c2fe78..4333519 100644 +--- a/dlls/d3dx9_34/d3dx9_34.spec ++++ b/dlls/d3dx9_34/d3dx9_34.spec +@@ -157,7 +157,7 @@ + @ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec +index 8c2fe78..4333519 100644 +--- a/dlls/d3dx9_35/d3dx9_35.spec ++++ b/dlls/d3dx9_35/d3dx9_35.spec +@@ -157,7 +157,7 @@ + @ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr) + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec -index f79b6fa..cba33b4 100644 +index 622f2d0..e81aef2 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -159,7 +159,7 @@ @@ -25,7 +200,7 @@ index f79b6fa..cba33b4 100644 @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) @ stdcall D3DXGetShaderSize(ptr) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c -index e9d893b..2918bde 100644 +index 9723aa4..940cd15 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1,6 +1,7 @@ @@ -36,7 +211,7 @@ index e9d893b..2918bde 100644 * Copyright 2011 Travis Athougies * * This library is free software; you can redistribute it and/or -@@ -2151,3 +2152,95 @@ HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const +@@ -2146,3 +2147,95 @@ HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const FIXME("%p %d %s %p: stub\n", shader, colorcode, debugstr_a(comments), disassembly); return E_OUTOFMEMORY; } @@ -133,7 +308,7 @@ index e9d893b..2918bde 100644 + return D3D_OK; +} diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c -index 694540c..728cd86 100644 +index 4a7ae67..9a2769f 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1,5 +1,6 @@ @@ -247,6 +422,97 @@ index 694540c..728cd86 100644 test_registerset_defaults(); + test_get_shader_semantics(); } +diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec +index 622f2d0..e81aef2 100644 +--- a/dlls/d3dx9_37/d3dx9_37.spec ++++ b/dlls/d3dx9_37/d3dx9_37.spec +@@ -159,7 +159,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec +index 622f2d0..e81aef2 100644 +--- a/dlls/d3dx9_38/d3dx9_38.spec ++++ b/dlls/d3dx9_38/d3dx9_38.spec +@@ -159,7 +159,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec +index 622f2d0..e81aef2 100644 +--- a/dlls/d3dx9_39/d3dx9_39.spec ++++ b/dlls/d3dx9_39/d3dx9_39.spec +@@ -159,7 +159,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec +index 622f2d0..e81aef2 100644 +--- a/dlls/d3dx9_40/d3dx9_40.spec ++++ b/dlls/d3dx9_40/d3dx9_40.spec +@@ -159,7 +159,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec +index 622f2d0..e81aef2 100644 +--- a/dlls/d3dx9_41/d3dx9_41.spec ++++ b/dlls/d3dx9_41/d3dx9_41.spec +@@ -159,7 +159,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec +index 7851c60..257c6bd 100644 +--- a/dlls/d3dx9_42/d3dx9_42.spec ++++ b/dlls/d3dx9_42/d3dx9_42.spec +@@ -152,7 +152,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) +diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec +index 7851c60..257c6bd 100644 +--- a/dlls/d3dx9_43/d3dx9_43.spec ++++ b/dlls/d3dx9_43/d3dx9_43.spec +@@ -152,7 +152,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) +-@ stub D3DXGetShaderInputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) + @ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index a3f68f2..5714ddb 100644 --- a/include/d3dx9shader.h @@ -260,5 +526,5 @@ index a3f68f2..5714ddb 100644 HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages); -- -2.6.1 +2.8.0 diff --git a/patches/d3dx9_36-GetShaderSemantics/0002-d3dx9_36-Implement-D3DXGetShaderOutputSemantics.-rev.patch b/patches/d3dx9_36-GetShaderSemantics/0002-d3dx9_36-Implement-D3DXGetShaderOutputSemantics.-rev.patch index 17e03522..63685660 100644 --- a/patches/d3dx9_36-GetShaderSemantics/0002-d3dx9_36-Implement-D3DXGetShaderOutputSemantics.-rev.patch +++ b/patches/d3dx9_36-GetShaderSemantics/0002-d3dx9_36-Implement-D3DXGetShaderOutputSemantics.-rev.patch @@ -1,18 +1,193 @@ -From b92b1b248050bc0b0b900de72b01cb79ef88df94 Mon Sep 17 00:00:00 2001 +From 93d8dea11ef99d14e59031586bbb62d300b4385a Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 8 Jul 2015 10:55:03 +1000 Subject: d3dx9_36: Implement D3DXGetShaderOutputSemantics. (rev 2) Signed-off-by: Alistair Leslie-Hughes --- + dlls/d3dx9_24/d3dx9_24.spec | 2 +- + dlls/d3dx9_25/d3dx9_25.spec | 2 +- + dlls/d3dx9_26/d3dx9_26.spec | 2 +- + dlls/d3dx9_27/d3dx9_27.spec | 2 +- + dlls/d3dx9_28/d3dx9_28.spec | 2 +- + dlls/d3dx9_29/d3dx9_29.spec | 2 +- + dlls/d3dx9_30/d3dx9_30.spec | 2 +- + dlls/d3dx9_31/d3dx9_31.spec | 2 +- + dlls/d3dx9_32/d3dx9_32.spec | 2 +- + dlls/d3dx9_33/d3dx9_33.spec | 2 +- + dlls/d3dx9_34/d3dx9_34.spec | 2 +- + dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 20 +++++++++++++++- dlls/d3dx9_36/tests/shader.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ + dlls/d3dx9_37/d3dx9_37.spec | 2 +- + dlls/d3dx9_38/d3dx9_38.spec | 2 +- + dlls/d3dx9_39/d3dx9_39.spec | 2 +- + dlls/d3dx9_40/d3dx9_40.spec | 2 +- + dlls/d3dx9_41/d3dx9_41.spec | 2 +- + dlls/d3dx9_42/d3dx9_42.spec | 2 +- + dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9shader.h | 1 + - 4 files changed, 75 insertions(+), 2 deletions(-) + 23 files changed, 94 insertions(+), 21 deletions(-) +diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec +index 7e4217d..c53c946 100644 +--- a/dlls/d3dx9_24/d3dx9_24.spec ++++ b/dlls/d3dx9_24/d3dx9_24.spec +@@ -155,7 +155,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec +index 2c7ae49..2072001 100644 +--- a/dlls/d3dx9_25/d3dx9_25.spec ++++ b/dlls/d3dx9_25/d3dx9_25.spec +@@ -155,7 +155,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec +index 21b7f3c..5e1bce9 100644 +--- a/dlls/d3dx9_26/d3dx9_26.spec ++++ b/dlls/d3dx9_26/d3dx9_26.spec +@@ -159,7 +159,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec +index 21b7f3c..5e1bce9 100644 +--- a/dlls/d3dx9_27/d3dx9_27.spec ++++ b/dlls/d3dx9_27/d3dx9_27.spec +@@ -159,7 +159,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec +index 5f630a6..503d0b2 100644 +--- a/dlls/d3dx9_28/d3dx9_28.spec ++++ b/dlls/d3dx9_28/d3dx9_28.spec +@@ -159,7 +159,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec +index 5f630a6..503d0b2 100644 +--- a/dlls/d3dx9_29/d3dx9_29.spec ++++ b/dlls/d3dx9_29/d3dx9_29.spec +@@ -159,7 +159,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec +index 5f0e3a4..74bf709 100644 +--- a/dlls/d3dx9_30/d3dx9_30.spec ++++ b/dlls/d3dx9_30/d3dx9_30.spec +@@ -159,7 +159,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec +index 1d52ecb..b1fa7bf 100644 +--- a/dlls/d3dx9_31/d3dx9_31.spec ++++ b/dlls/d3dx9_31/d3dx9_31.spec +@@ -158,7 +158,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec +index 4333519..4e65a9e 100644 +--- a/dlls/d3dx9_32/d3dx9_32.spec ++++ b/dlls/d3dx9_32/d3dx9_32.spec +@@ -158,7 +158,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec +index 4333519..4e65a9e 100644 +--- a/dlls/d3dx9_33/d3dx9_33.spec ++++ b/dlls/d3dx9_33/d3dx9_33.spec +@@ -158,7 +158,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec +index 4333519..4e65a9e 100644 +--- a/dlls/d3dx9_34/d3dx9_34.spec ++++ b/dlls/d3dx9_34/d3dx9_34.spec +@@ -158,7 +158,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec +index 4333519..4e65a9e 100644 +--- a/dlls/d3dx9_35/d3dx9_35.spec ++++ b/dlls/d3dx9_35/d3dx9_35.spec +@@ -158,7 +158,7 @@ + @ stdcall D3DXGetPixelShaderProfile(ptr) + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec -index cba33b4..7cbf499 100644 +index e81aef2..4454d25 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -160,7 +160,7 @@ @@ -25,10 +200,10 @@ index cba33b4..7cbf499 100644 @ stdcall D3DXGetShaderSize(ptr) @ stdcall D3DXGetShaderVersion(ptr) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c -index 39f1f31..c699299 100644 +index 940cd15..a5871c5 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c -@@ -2192,7 +2192,7 @@ static UINT get_shader_semantics(const DWORD *byte_code, D3DXSEMANTIC *semantics +@@ -2187,7 +2187,7 @@ static UINT get_shader_semantics(const DWORD *byte_code, D3DXSEMANTIC *semantics { if (*ptr & (1u << 31)) { @@ -37,7 +212,7 @@ index 39f1f31..c699299 100644 return 0; } else if ((*ptr & D3DSI_OPCODE_MASK) == D3DSIO_DCL) -@@ -2243,3 +2243,21 @@ HRESULT WINAPI D3DXGetShaderInputSemantics(const DWORD *byte_code, D3DXSEMANTIC +@@ -2239,3 +2239,21 @@ HRESULT WINAPI D3DXGetShaderInputSemantics(const DWORD *byte_code, D3DXSEMANTIC return D3D_OK; } @@ -60,7 +235,7 @@ index 39f1f31..c699299 100644 + return D3D_OK; +} diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c -index 728cd86..946143e 100644 +index 9a2769f..6b76bf7 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6572,6 +6572,60 @@ static void test_get_shader_semantics(void) @@ -124,6 +299,97 @@ index 728cd86..946143e 100644 } START_TEST(shader) +diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec +index e81aef2..4454d25 100644 +--- a/dlls/d3dx9_37/d3dx9_37.spec ++++ b/dlls/d3dx9_37/d3dx9_37.spec +@@ -160,7 +160,7 @@ + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec +index e81aef2..4454d25 100644 +--- a/dlls/d3dx9_38/d3dx9_38.spec ++++ b/dlls/d3dx9_38/d3dx9_38.spec +@@ -160,7 +160,7 @@ + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec +index e81aef2..4454d25 100644 +--- a/dlls/d3dx9_39/d3dx9_39.spec ++++ b/dlls/d3dx9_39/d3dx9_39.spec +@@ -160,7 +160,7 @@ + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec +index e81aef2..4454d25 100644 +--- a/dlls/d3dx9_40/d3dx9_40.spec ++++ b/dlls/d3dx9_40/d3dx9_40.spec +@@ -160,7 +160,7 @@ + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec +index e81aef2..4454d25 100644 +--- a/dlls/d3dx9_41/d3dx9_41.spec ++++ b/dlls/d3dx9_41/d3dx9_41.spec +@@ -160,7 +160,7 @@ + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec +index 257c6bd..c03d804 100644 +--- a/dlls/d3dx9_42/d3dx9_42.spec ++++ b/dlls/d3dx9_42/d3dx9_42.spec +@@ -153,7 +153,7 @@ + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) +diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec +index 257c6bd..c03d804 100644 +--- a/dlls/d3dx9_43/d3dx9_43.spec ++++ b/dlls/d3dx9_43/d3dx9_43.spec +@@ -153,7 +153,7 @@ + @ stdcall D3DXGetShaderConstantTable(ptr ptr) + @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) + @ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) +-@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr) ++@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) + @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) + @ stdcall D3DXGetShaderSize(ptr) + @ stdcall D3DXGetShaderVersion(ptr) diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 5714ddb..1176143 100644 --- a/include/d3dx9shader.h @@ -137,5 +403,5 @@ index 5714ddb..1176143 100644 HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages); -- -2.6.1 +2.8.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index a7014d36..a330dd85 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2947,7 +2947,12 @@ fi # | * [#22682] Support for D3DXGetShaderInputSemantics # | # | Modified files: -# | * dlls/d3dx9_36/d3dx9_36.spec, dlls/d3dx9_36/shader.c, dlls/d3dx9_36/tests/shader.c, include/d3dx9shader.h +# | * dlls/d3dx9_24/d3dx9_24.spec, dlls/d3dx9_25/d3dx9_25.spec, dlls/d3dx9_26/d3dx9_26.spec, dlls/d3dx9_27/d3dx9_27.spec, +# | dlls/d3dx9_28/d3dx9_28.spec, dlls/d3dx9_29/d3dx9_29.spec, dlls/d3dx9_30/d3dx9_30.spec, dlls/d3dx9_31/d3dx9_31.spec, +# | dlls/d3dx9_32/d3dx9_32.spec, dlls/d3dx9_33/d3dx9_33.spec, dlls/d3dx9_34/d3dx9_34.spec, dlls/d3dx9_35/d3dx9_35.spec, +# | dlls/d3dx9_36/d3dx9_36.spec, dlls/d3dx9_36/shader.c, dlls/d3dx9_36/tests/shader.c, dlls/d3dx9_37/d3dx9_37.spec, +# | dlls/d3dx9_38/d3dx9_38.spec, dlls/d3dx9_39/d3dx9_39.spec, dlls/d3dx9_40/d3dx9_40.spec, dlls/d3dx9_41/d3dx9_41.spec, +# | dlls/d3dx9_42/d3dx9_42.spec, dlls/d3dx9_43/d3dx9_43.spec, include/d3dx9shader.h # | if test "$enable_d3dx9_36_GetShaderSemantics" -eq 1; then patch_apply d3dx9_36-GetShaderSemantics/0001-d3dx9_36-Implement-D3DXGetShaderInputSemantics-tests.patch