d3dcompiler_43/tests: fixed nonconformant C string literals in HLSL test suite

Travis Athougies iammisc at gmail.com
Tue Jan 4 15:25:59 CST 2011


---
 dlls/d3dcompiler_43/tests/hlsl.c |  110 +++++++++++++++++++-------------------
 1 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c
index 1f8e31c..dc4cb36 100644
--- a/dlls/d3dcompiler_43/tests/hlsl.c
+++ b/dlls/d3dcompiler_43/tests/hlsl.c
@@ -70,10 +70,10 @@ static IDirect3DDevice9 *init_d3d9(IDirect3DVertexDeclaration9 **vdeclaration,
     };
 
     static const char *vshader_passthru_hlsl =
-        "float4 vshader(float4 pos: POSITION, inout float2 texcoord: TEXCOORD0): POSITION \
-         {                                                                                \
-            return pos;                                                                   \
-         }";
+        "float4 vshader(float4 pos: POSITION, inout float2 texcoord: TEXCOORD0): POSITION"
+        "{"
+        "   return pos;"
+        "}";
 
     IDirect3D9 *d3d9_ptr;
     IDirect3DDevice9 *device_ptr = NULL;
@@ -301,14 +301,14 @@ static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_
     };
 
     static const char *swizzle_test_shader =
-        "uniform float4 color;                  \
-        float4 test(): COLOR                    \
-        {                                       \
-            float4 ret = color;                 \
-            ret.gb = ret.ra;                    \
-            ret.ra = float2(0.0101, 0.0404);    \
-            return ret;                         \
-        }";
+        "uniform float4 color;"
+        "float4 test(): COLOR"
+        "{"
+        "    float4 ret = color;"
+        "    ret.gb = ret.ra;"
+        "    ret.ra = float2(0.0101, 0.0404);"
+        "    return ret;"
+        "}";
 
     ID3DXConstantTable *constants;
     IDirect3DPixelShader9 *pshader;
@@ -339,14 +339,14 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo
     };
 
     static const char *order_of_operations_shader =
-        "float4 test(uniform float u, uniform float v, uniform float w, uniform float x, \
-                     uniform float y, uniform float z): COLOR                            \
-        {                                                                                \
-            return float4(x * y - z / w + --u / -v,                                      \
-                    z * x / y + w / -v,                                                  \
-                    u + v - w,                                                           \
-                    x / y / w);                                                          \
-        }";
+        "float4 test(uniform float u, uniform float v, uniform float w, uniform float x,"
+        "            uniform float y, uniform float z): COLOR"
+        "{"
+        "    return float4(x * y - z / w + --u / -v,"
+        "            z * x / y + w / -v,"
+        "            u + v - w,"
+        "            x / y / w);"
+        "}";
 
     ID3DXConstantTable *constants;
     IDirect3DPixelShader9 *pshader;
@@ -383,13 +383,13 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *
     };
 
     static const char *if_greater_shader =
-        "float4 test(float2 pos: TEXCOORD0): COLOR \
-        {                                          \
-            if((pos.x * 32.0) > 20.0)              \
-                return float4(0.1, 0.2, 0.3, 0.4); \
-            else                                   \
-                return float4(0.9, 0.8, 0.7, 0.6); \
-        }";
+        "float4 test(float2 pos: TEXCOORD0): COLOR"
+        "{"
+        "    if((pos.x * 32.0) > 20.0)"
+        "        return float4(0.1, 0.2, 0.3, 0.4);"
+        "    else"
+        "        return float4(0.9, 0.8, 0.7, 0.6);"
+        "}";
 
     static const struct hlsl_probe_info ternary_operator_probes[] =
     {
@@ -404,10 +404,10 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *
     };
 
     static const char *ternary_operator_shader =
-        "float4 test(float2 pos: TEXCOORD0): COLOR                                        \
-        {                                                                                 \
-            return (pos.x < 0.5?float4(0.5, 0.25, 0.5, 0.75):float4(0.6, 0.8, 0.1, 0.2)); \
-        }";
+        "float4 test(float2 pos: TEXCOORD0): COLOR"
+        "{"
+        "    return (pos.x < 0.5?float4(0.5, 0.25, 0.5, 0.75):float4(0.6, 0.8, 0.1, 0.2));"
+        "}";
 
     ID3DXConstantTable *constants;
     IDirect3DPixelShader9 *pshader;
@@ -442,15 +442,15 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9
     };
 
     static const char *vec4_indexing_test1_shader =
-        "float4 test(): COLOR                   \
-        {                                       \
-            float4 color;                       \
-            color[0] = 0.020;                   \
-            color[1] = 0.245;                   \
-            color[2] = 0.351;                   \
-            color[3] = 1.0;                     \
-            return color;                       \
-        }";
+        "float4 test(): COLOR"
+        "{"
+        "    float4 color;"
+        "    color[0] = 0.020;"
+        "    color[1] = 0.245;"
+        "    color[2] = 0.351;"
+        "    color[3] = 1.0;"
+        "    return color;"
+        "}";
 
     static const struct hlsl_probe_info vec4_indexing_test2_probes[] =
     {
@@ -459,14 +459,14 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9
 
     /* We have this uniform i here so the compiler can't optimize */
     static const char *vec4_indexing_test2_shader =
-        "uniform int i;                                 \
-        float4 test(): COLOR                            \
-        {                                               \
-            float4 color = float4(0.5, 0.4, 0.3, 0.2);  \
-            color.g = color[i];                         \
-            color.b = 0.8;                              \
-            return color;                               \
-        }";
+        "uniform int i;"
+        "float4 test(): COLOR"
+        "{"
+        "    float4 color = float4(0.5, 0.4, 0.3, 0.2);"
+        "    color.g = color[i];"
+        "    color.b = 0.8;"
+        "    return color;"
+        "}";
 
     ID3DXConstantTable *constants;
     IDirect3DPixelShader9 *pshader;
@@ -534,13 +534,13 @@ static void test_trig(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo
     };
 
     static const char *sincos_shader =
-        "float4 test(float x: TEXCOORD0): COLOR        \
-         {                                             \
-            const float pi2 = 6.2831853;               \
-            float calcd_sin = (sin(x * pi2) + 1)/2;    \
-            float calcd_cos = (cos(x * pi2) + 1)/2;    \
-            return float4(calcd_sin, calcd_cos, 0, 0); \
-         }";
+        "float4 test(float x: TEXCOORD0): COLOR"
+        "{"
+        "    const float pi2 = 6.2831853;"
+        "    float calcd_sin = (sin(x * pi2) + 1)/2;"
+        "    float calcd_cos = (cos(x * pi2) + 1)/2;"
+        "    return float4(calcd_sin, calcd_cos, 0, 0);"
+        "}";
 
     ID3DXConstantTable *constants;
     IDirect3DPixelShader9 *pshader;
-- 
1.7.0.4




More information about the wine-patches mailing list