commit 79f0365ab180e5e7ce61efa44e5b8d9d06da5fcd
parent 1bf13c2103b933707c053d85806142ee402c2611
Author: Brian Swetland <swetland@frotz.net>
Date: Sun, 10 Feb 2013 08:20:36 -0800
project for test
Diffstat:
5 files changed, 202 insertions(+), 3 deletions(-)
diff --git a/common/dxapp.h b/common/dxapp.h
@@ -183,7 +183,9 @@ public:
void drawInstanced(unsigned numvertices, unsigned numinstances) {
device->DrawInstanced(numvertices, numinstances, 0, 0);
}
-
+ void drawIndexed(unsigned numindices) {
+ device->DrawIndexed(numindices, 0, 0);
+ };
void setBlend(int enabled);
protected:
int width;
diff --git a/graphics.sln b/graphics.sln
@@ -21,6 +21,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcx
{9A238D95-47DB-4254-A680-F100AA9E755C} = {9A238D95-47DB-4254-A680-F100AA9E755C}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj", "{DA776F1D-F023-4821-B8D6-CF901B8B56A8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {F5A10B0A-0EC0-4A76-B4DD-748CA4047E50} = {F5A10B0A-0EC0-4A76-B4DD-748CA4047E50}
+ {40A5DC51-53B0-4982-89AD-F9C2C85BB97A} = {40A5DC51-53B0-4982-89AD-F9C2C85BB97A}
+ {9A238D95-47DB-4254-A680-F100AA9E755C} = {9A238D95-47DB-4254-A680-F100AA9E755C}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -46,12 +53,18 @@ Global
{812CD397-998F-4D9C-9BF3-1549F360EABE}.OpenGL-Debug|Win32.Build.0 = OpenGL-Debug|Win32
{812CD397-998F-4D9C-9BF3-1549F360EABE}.Release|Win32.ActiveCfg = Release|Win32
{812CD397-998F-4D9C-9BF3-1549F360EABE}.Release|Win32.Build.0 = Release|Win32
- {40A5DC51-53B0-4982-89AD-F9C2C85BB97A}.Debug|Win32.ActiveCfg = OpenGL-Debug|Win32
- {40A5DC51-53B0-4982-89AD-F9C2C85BB97A}.Debug|Win32.Build.0 = OpenGL-Debug|Win32
+ {40A5DC51-53B0-4982-89AD-F9C2C85BB97A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {40A5DC51-53B0-4982-89AD-F9C2C85BB97A}.Debug|Win32.Build.0 = Debug|Win32
{40A5DC51-53B0-4982-89AD-F9C2C85BB97A}.OpenGL-Debug|Win32.ActiveCfg = OpenGL-Debug|Win32
{40A5DC51-53B0-4982-89AD-F9C2C85BB97A}.OpenGL-Debug|Win32.Build.0 = OpenGL-Debug|Win32
{40A5DC51-53B0-4982-89AD-F9C2C85BB97A}.Release|Win32.ActiveCfg = Release|Win32
{40A5DC51-53B0-4982-89AD-F9C2C85BB97A}.Release|Win32.Build.0 = Release|Win32
+ {DA776F1D-F023-4821-B8D6-CF901B8B56A8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DA776F1D-F023-4821-B8D6-CF901B8B56A8}.Debug|Win32.Build.0 = Debug|Win32
+ {DA776F1D-F023-4821-B8D6-CF901B8B56A8}.OpenGL-Debug|Win32.ActiveCfg = OpenGL-Debug|Win32
+ {DA776F1D-F023-4821-B8D6-CF901B8B56A8}.OpenGL-Debug|Win32.Build.0 = OpenGL-Debug|Win32
+ {DA776F1D-F023-4821-B8D6-CF901B8B56A8}.Release|Win32.ActiveCfg = Release|Win32
+ {DA776F1D-F023-4821-B8D6-CF901B8B56A8}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/test/assets/TestPS.hlsl b/test/assets/TestPS.hlsl
@@ -0,0 +1,15 @@
+
+//Texture2D Texture0;
+//SamplerState samLinear;
+
+struct VS_OUTPUT {
+ float4 Position : SV_POSITION;
+ float2 TexCoord : TEXCOORD;
+ float Diffuse : DIFFUSE;
+};
+
+float4 main(VS_OUTPUT input) : SV_Target {
+// return Texture0.Sample(samLinear, input.TexCoord);
+ float4 c = float4(1.0, 0.0, 0.0, 1.0);
+ return c * 0.25 + c * input.Diffuse;
+}
diff --git a/test/assets/TestVS.hlsl b/test/assets/TestVS.hlsl
@@ -0,0 +1,33 @@
+
+cbuffer cb0 {
+ matrix MVP;
+ matrix MV;
+}
+
+struct VS_OUTPUT {
+ float4 Position : SV_POSITION;
+ float2 TexCoord : TEXCOORD;
+ float Diffuse : DIFFUSE;
+};
+
+VS_OUTPUT main(
+ float4 Position : POSITION,
+ float4 Normal : NORMAL,
+ float2 TexCoord : TEXCOORD
+ ) {
+
+ VS_OUTPUT output = (VS_OUTPUT) 0;
+
+ float3 mvPosition = mul(MV, Position).xyz;
+ float3 mvNormal = mul(MV, float4(Normal.xyz,0.0)).xyz;
+
+// float3 lightVec = normalize(float3(10,20,25) - float3(0,0,0));
+ float3 lightVec = normalize(float3(10,20,25) - mvPosition);
+ float diffuse = max(dot(mvNormal, lightVec), 0.0);
+
+ output.Position = mul(MVP, Position);
+ output.TexCoord = TexCoord;
+ output.Diffuse = diffuse;
+
+ return output;
+}
diff --git a/test/test.vcxproj b/test/test.vcxproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="OpenGL-Debug|Win32">
+ <Configuration>OpenGL-Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="test.cc" />
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{DA776F1D-F023-4821-B8D6-CF901B8B56A8}</ProjectGuid>
+ <RootNamespace>hello</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v110</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='OpenGL-Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v110</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v110</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='OpenGL-Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ExecutablePath>$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath>
+ <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
+ <LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='OpenGL-Debug|Win32'">
+ <ExecutablePath>$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath>
+ <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
+ <LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ExecutablePath>$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath>
+ <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
+ <LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>d3d10.lib;dxerr.lib;dxguid.lib;winmm.lib;d3dcompiler.lib;dinput8.lib;common.lib;libpng-1.2.50.lib;zlib-1.2.7.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <SubSystem>Windows</SubSystem>
+ <AdditionalLibraryDirectories>../Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ <PostBuildEvent>
+ <Command>XCOPY "$(ProjectDir)..\common\assets" "$(TargetDir)assets" /E /I /F /Y
+XCOPY "$(ProjectDir)assets" "$(TargetDir)assets" /E /I /F /Y</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='OpenGL-Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <AdditionalIncludeDirectories>..\..\SDL-1.2.15\include;..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>USE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>common.lib;SDL.lib;SDLmain.lib;libpng-1.2.50.lib;zlib-1.2.7.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <SubSystem>Windows</SubSystem>
+ <AdditionalLibraryDirectories>..\..\SDL-1.2.15\lib\x86;..\OpenGL-Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ <PostBuildEvent>
+ <Command>XCOPY "$(ProjectDir)..\..\SDL-1.2.15\lib\x86\SDL.dll" "$(TargetDir)" /E /I /F /Y
+XCOPY "$(ProjectDir)..\common\assets" "$(TargetDir)assets" /E /I /F /Y
+XCOPY "$(ProjectDir)assets" "$(TargetDir)assets" /E /I /F /Y</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>common.lib;d3d10.lib;dxerr.lib;dxguid.lib;winmm.lib;d3dcompiler.lib;dinput8.lib;libpng-1.2.50.lib;zlib-1.2.7.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <SubSystem>Windows</SubSystem>
+ <AdditionalLibraryDirectories>../Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ <PostBuildEvent>
+ <Command>XCOPY "$(ProjectDir)..\common\assets" "$(TargetDir)assets" /E /I /F /Y
+XCOPY "$(ProjectDir)assets" "$(TargetDir)assets" /E /I /F /Y</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
+\ No newline at end of file
