Changeset 1389Tweet

Timestamp:

May 14, 2012, 2:14:37 PM (11 years ago)

Author:

sam

Message:

gpu: define the _XBOX macro in our HLSL compilation.

Location:

trunk

Files:

• orbital/shiny.lolfx (modified) (1 diff)
• src/gpu/shader.cpp (modified) (3 diffs)

trunk/orbital/shiny.lolfx

@@ -90 +90 @@
                  * pow(max(dot(r, v), 0.0), specular_power);
     float3 light = ambient + diffuse + specular;
-    float4 real_color = in_Damage * float4(1.2, 0.2, 0.2, 1.0)
-                      + (1.0 - in_Damage) * in_Color;
+#ifdef _XBOX
+    float4 real_color = in_Color.abgr;
+#else
+    float4 real_color = in_Color;
+#endif
+    real_color = in_Damage * float4(1.2, 0.2, 0.2, 1.0)
+               + (1.0 - in_Damage) * real_color;
     pass_Color = real_color * float4(light, 1.0);
     out_Position = mul(in_Proj, eye);

trunk/src/gpu/shader.cpp

@@ -172 +172 @@
     ID3DXBuffer *shader_code, *error_msg;
     HRESULT hr;
+    D3DXMACRO macros[] =
+    {
+#if defined _XBOX
+        { "_XBOX", "1" },
+#endif
+        { NULL, NULL }
+    };
 #elif !defined __CELLOS_LV2__
     char buf[4096], errbuf[4096];
@@ -186 +193 @@
     data->vert_crc = Hash::Crc32(vert);
 #if defined USE_D3D9 || defined _XBOX
-    hr = D3DXCompileShader(vert, (UINT)strlen(vert), NULL, NULL, "main",
+    hr = D3DXCompileShader(vert, (UINT)strlen(vert), macros, NULL, "main",
                            "vs_2_0", 0, &shader_code, &error_msg,
                            &data->vert_table);
@@ -225 +232 @@
     data->frag_crc = Hash::Crc32(frag);
 #if defined USE_D3D9 || defined _XBOX
-    hr = D3DXCompileShader(frag, (UINT)strlen(frag), NULL, NULL, "main",
+    hr = D3DXCompileShader(frag, (UINT)strlen(frag), macros, NULL, "main",
                            "ps_2_0", 0, &shader_code, &error_msg,
                            &data->frag_table);