diff --git a/Debug/Tester.ilk b/Debug/Tester.ilk new file mode 100644 index 00000000..79981c45 Binary files /dev/null and b/Debug/Tester.ilk differ diff --git a/Debug/Tester.pdb b/Debug/Tester.pdb index 30fdfb14..f2f5e970 100644 Binary files a/Debug/Tester.pdb and b/Debug/Tester.pdb differ diff --git a/OysterGraphics/Core/ShaderManager.cpp b/OysterGraphics/Core/ShaderManager.cpp index 45124ebe..fe40bb84 100644 --- a/OysterGraphics/Core/ShaderManager.cpp +++ b/OysterGraphics/Core/ShaderManager.cpp @@ -1,7 +1,7 @@ #include "Core.h" #include -const char* ShaderFunction = "ShaderMain"; +const char* ShaderFunction = "main"; namespace Oyster { diff --git a/OysterGraphics/OysterGraphics.vcxproj b/OysterGraphics/OysterGraphics.vcxproj index 3d452903..45df7d9d 100644 --- a/OysterGraphics/OysterGraphics.vcxproj +++ b/OysterGraphics/OysterGraphics.vcxproj @@ -182,7 +182,7 @@ Pixel true 5.0 - ShaderMain + main Vertex @@ -191,7 +191,7 @@ Vertex true 5.0 - ShaderMain + main diff --git a/OysterGraphics/Shader/HLSL/SimpleDebug/DebugPixel.hlsl b/OysterGraphics/Shader/HLSL/SimpleDebug/DebugPixel.hlsl index 412bf9a5..a2cd5acf 100644 --- a/OysterGraphics/Shader/HLSL/SimpleDebug/DebugPixel.hlsl +++ b/OysterGraphics/Shader/HLSL/SimpleDebug/DebugPixel.hlsl @@ -1,4 +1,4 @@ -float4 ShaderMain() : SV_TARGET +float4 main() : SV_TARGET { return float4(1.0f, 0.0f, 0.0f, 1.0f); } \ No newline at end of file diff --git a/OysterGraphics/Shader/HLSL/SimpleDebug/DebugVertex.hlsl b/OysterGraphics/Shader/HLSL/SimpleDebug/DebugVertex.hlsl index a3a5c4aa..94efe039 100644 --- a/OysterGraphics/Shader/HLSL/SimpleDebug/DebugVertex.hlsl +++ b/OysterGraphics/Shader/HLSL/SimpleDebug/DebugVertex.hlsl @@ -1,4 +1,4 @@ -float4 ShaderMain( float4 pos : POSITION ) : SV_POSITION +float4 main( float4 pos : POSITION ) : SV_POSITION { return pos; } \ No newline at end of file diff --git a/Tester/Debug/MainTest.obj b/Tester/Debug/MainTest.obj index 6612ee11..3fa96e29 100644 Binary files a/Tester/Debug/MainTest.obj and b/Tester/Debug/MainTest.obj differ diff --git a/Tester/Debug/Tester.log b/Tester/Debug/Tester.log index 1187c892..2c2e96b0 100644 --- a/Tester/Debug/Tester.log +++ b/Tester/Debug/Tester.log @@ -1,17 +1,13 @@ -Build started 11/15/2013 8:31:58 AM. - 1>Project "C:\DanBias\Danbias\Tester\Tester.vcxproj" on node 2 (Build target(s)). - 1>ClCompile: - C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\CL.exe /c /I..\OysterGraphics /I..\OysterMath /I..\Misc /ZI /nologo /W3 /WX- /sdl /Od /Oy- /D WIN32 /D _DEBUG /D _WINDOWS /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc110.pdb" /Gd /TP /analyze- /errorReport:prompt MainTest.cpp - MainTest.cpp - Link: +Build started 11/15/2013 11:04:26 AM. + 1>Project "C:\DanBias\Danbias\Tester\Tester.vcxproj" on node 3 (Build target(s)). + 1>Link: C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"C:\DanBias\Danbias\Debug\Tester.exe" /INCREMENTAL /NOLOGO kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /DEBUG /PDB:"C:\DanBias\Danbias\Debug\Tester.pdb" /SUBSYSTEM:WINDOWS /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"C:\DanBias\Danbias\Debug\Tester.lib" /MACHINE:X86 Debug\MainTest.obj C:\DanBias\External\Lib\Misc\Misc_x86D.lib C:\DanBias\External\Lib\OysterMath\OysterMath_x86D.lib C:\DanBias\External\Lib\OysterGraphics\OysterGraphics_x86D.lib - 1>MainTest.obj : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/OPT:LBR' specification Tester.vcxproj -> C:\DanBias\Danbias\Debug\Tester.exe 1>Done Building Project "C:\DanBias\Danbias\Tester\Tester.vcxproj" (Build target(s)). Build succeeded. -Time Elapsed 00:00:05.17 +Time Elapsed 00:00:00.98 diff --git a/Tester/Debug/link.6348-cvtres.read.1.tlog b/Tester/Debug/link.6348-cvtres.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.6348-cvtres.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.6348-cvtres.write.1.tlog b/Tester/Debug/link.6348-cvtres.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.6348-cvtres.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.6348-rc.read.1.tlog b/Tester/Debug/link.6348-rc.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.6348-rc.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.6348-rc.write.1.tlog b/Tester/Debug/link.6348-rc.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.6348-rc.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.6348.read.1.tlog b/Tester/Debug/link.6348.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.6348.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.6348.write.1.tlog b/Tester/Debug/link.6348.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.6348.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.read.1.tlog b/Tester/Debug/link.read.1.tlog index 548904c1..a6faf923 100644 Binary files a/Tester/Debug/link.read.1.tlog and b/Tester/Debug/link.read.1.tlog differ diff --git a/Tester/Debug/link.write.1.tlog b/Tester/Debug/link.write.1.tlog index 3f42e49f..e18501b8 100644 Binary files a/Tester/Debug/link.write.1.tlog and b/Tester/Debug/link.write.1.tlog differ diff --git a/Tester/Debug/vc110.idb b/Tester/Debug/vc110.idb index d47848fa..7790813b 100644 Binary files a/Tester/Debug/vc110.idb and b/Tester/Debug/vc110.idb differ diff --git a/Tester/Debug/vc110.pdb b/Tester/Debug/vc110.pdb index cbed4c20..7a8bf47b 100644 Binary files a/Tester/Debug/vc110.pdb and b/Tester/Debug/vc110.pdb differ