Commit 8969acb9 authored by D-AIRY's avatar D-AIRY

moved GraphiX to submodule

parent 8e358095
......@@ -4,3 +4,6 @@
[submodule "source/common"]
path = source/common
url = https://root@dev.ds-servers.com/sip/common.git
[submodule "sdks/graphix"]
path = sdks/graphix
url = https://root@dev.ds-servers.com/sip/graphix.git
graphix @ c248ce82
Subproject commit c248ce8257d09b941482b11e598734798d884880
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.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="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{DAFA20F5-5162-4F21-99AF-DB8084D3C557}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>gxgapidx11</RootNamespace>
<ProjectName>gxgapidx11</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120_xp</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120_xp</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 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'">
<LinkIncremental>true</LinkIncremental>
<OutDir>../../../../../../build/bin/</OutDir>
<IncludePath>../../../../../../source/;../../../../../;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
<LibraryPath>../../../../../../libs/;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../../../../build/bin/</OutDir>
<IncludePath>../../../../../../source/;../../../../../;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
<LibraryPath>../../../../../../libs/;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GXGAPIDX11_EXPORTS;%(PreprocessorDefinitions);</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<TreatSpecificWarningsAsErrors>4316</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>../../../../../../libs/$(TargetName)_d.lib</ImportLibrary>
<AdditionalDependencies>Crypt32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GXGAPIDX11_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<TreatSpecificWarningsAsErrors>4316</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ImportLibrary>../../../../../../libs/$(TargetName).lib</ImportLibrary>
<AdditionalDependencies>Crypt32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{b75680fb-8b44-4c0d-8702-7bd051aab8cd}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{8f5f23d4-6c64-4068-af82-d7c36299714d}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.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="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\graphix.h" />
<ClInclude Include="..\..\..\..\source\dx9\GXBlendState.h" />
<ClInclude Include="..\..\..\..\source\dx9\GXContext.h" />
<ClInclude Include="..\..\..\..\source\dx9\GXDepthStencilState.h" />
<ClInclude Include="..\..\..\..\source\dx9\GXDepthStencilSurface.h" />
<ClInclude Include="..\..\..\..\source\dx9\GXIndexBuffer.h" />
<ClInclude Include="..\..\..\..\source\dx9\GXRasterizerState.h" />
<ClInclude Include="..\..\..\..\source\dx9\GXRenderBuffer.h" />
<ClInclude Include="..\..\..\..\source\dx9\GXSamplerState.h" />
<ClInclude Include="..\..\..\..\source\dx9\GXShader.h" />
<ClInclude Include="..\..\..\..\source\dx9\GXSurface.h" />
<ClInclude Include="..\..\..\..\source\dx9\GXTexture.h" />
<ClInclude Include="..\..\..\..\source\dx9\GXVertexBuffer.h" />
<ClInclude Include="..\..\..\..\source\dx9\GXVertexDeclaration.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\source\dx9\dllmain.cpp" />
<ClCompile Include="..\..\..\..\source\dx9\GXBlendState.cpp" />
<ClCompile Include="..\..\..\..\source\dx9\GXContext.cpp" />
<ClCompile Include="..\..\..\..\source\dx9\GXDepthStencilState.cpp" />
<ClCompile Include="..\..\..\..\source\dx9\GXDepthStencilSurface.cpp" />
<ClCompile Include="..\..\..\..\source\dx9\GXIndexBuffer.cpp" />
<ClCompile Include="..\..\..\..\source\dx9\GXRasterizerState.cpp" />
<ClCompile Include="..\..\..\..\source\dx9\GXRenderBuffer.cpp" />
<ClCompile Include="..\..\..\..\source\dx9\GXSamplerState.cpp" />
<ClCompile Include="..\..\..\..\source\dx9\GXShader.cpp" />
<ClCompile Include="..\..\..\..\source\dx9\GXSurface.cpp" />
<ClCompile Include="..\..\..\..\source\dx9\GXTexture.cpp" />
<ClCompile Include="..\..\..\..\source\dx9\GXVertexBuffer.cpp" />
<ClCompile Include="..\..\..\..\source\dx9\GXVertexDeclaration.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{15AD3AF2-47B1-4836-9777-F1249EB299A7}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>gxgapidx9</RootNamespace>
<ProjectName>gxgapidx9</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120_xp</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120_xp</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 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'">
<LinkIncremental>true</LinkIncremental>
<OutDir>../../../../../../build/bin/</OutDir>
<IncludePath>../../../../../../source/;../../../../../;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../../../dx9sdk/Include;</IncludePath>
<LibraryPath>../../../../../dx9sdk/Lib;../../../../../../libs/;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../../../../build/bin/</OutDir>
<IncludePath>../../../../../../source/;../../../../../;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../../../dx9sdk/Include;</IncludePath>
<LibraryPath>../../../../../dx9sdk/Lib;../../../../../../libs/;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GXGAPIDX9_EXPORTS;%(PreprocessorDefinitions);</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<TreatSpecificWarningsAsErrors>4316</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>../../../../../../libs/$(TargetName)_d.lib</ImportLibrary>
<AdditionalDependencies>Crypt32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GXGAPIDX9_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<TreatSpecificWarningsAsErrors>4316</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ImportLibrary>../../../../../../libs/$(TargetName).lib</ImportLibrary>
<AdditionalDependencies>Crypt32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{16d93689-c15d-4ecb-ba42-e3a0f519476d}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{a01b66ed-9ad2-4021-8eba-8db0fe6adf84}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\source\dx9\GXContext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\dx9\GXIndexBuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\dx9\GXRenderBuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\dx9\GXShader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\dx9\GXVertexBuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\dx9\GXVertexDeclaration.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\dx9\GXSamplerState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\dx9\GXRasterizerState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\dx9\GXDepthStencilState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\dx9\GXBlendState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\dx9\GXDepthStencilSurface.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\dx9\GXSurface.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\dx9\GXTexture.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\graphix.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\source\dx9\GXContext.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\dx9\GXIndexBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\dx9\GXRenderBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\dx9\GXShader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\dx9\GXVertexBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\dx9\GXVertexDeclaration.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\dx9\dllmain.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\dx9\GXSamplerState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\dx9\GXRasterizerState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\dx9\GXDepthStencilState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\dx9\GXBlendState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\dx9\GXDepthStencilSurface.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\dx9\GXSurface.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\dx9\GXTexture.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.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="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\source\graphix.h" />
<ClInclude Include="..\..\..\..\source\ogl\GXContext.h" />
<ClInclude Include="..\..\..\..\source\ogl\GLPFN.h" />
<ClInclude Include="..\..\..\..\source\ogl\GXIndexBuffer.h" />
<ClInclude Include="..\..\..\..\source\ogl\GXRenderBuffer.h" />
<ClInclude Include="..\..\..\..\source\ogl\GXShader.h" />
<ClInclude Include="..\..\..\..\source\ogl\GXVertexBuffer.h" />
<ClInclude Include="..\..\..\..\source\ogl\GXVertexDeclaration.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\source\ogl\GXContext.cpp" />
<ClCompile Include="..\..\..\..\source\ogl\dllmain.cpp" />
<ClCompile Include="..\..\..\..\source\ogl\GLPFN.cpp" />
<ClCompile Include="..\..\..\..\source\ogl\GXIndexBuffer.cpp" />
<ClCompile Include="..\..\..\..\source\ogl\GXRenderBuffer.cpp" />
<ClCompile Include="..\..\..\..\source\ogl\GXShader.cpp" />
<ClCompile Include="..\..\..\..\source\ogl\GXVertexBuffer.cpp" />
<ClCompile Include="..\..\..\..\source\ogl\GXVertexDeclaration.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9117FCDB-957B-4FF8-8AD4-90965159B721}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>gxgapiogl</RootNamespace>
<ProjectName>gxgapiogl</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120_xp</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120_xp</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 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'">
<LinkIncremental>true</LinkIncremental>
<OutDir>../../../../../../build/bin/</OutDir>
<IncludePath>../../../../../../source/;../../../../../;../../../../../ogl/;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
<LibraryPath>../../../../../../libs/;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../../../../build/bin/</OutDir>
<IncludePath>../../../../../../source/;../../../../../;../../../../../ogl/;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
<LibraryPath>../../../../../../libs/;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GXGAPIOGL_EXPORTS;%(PreprocessorDefinitions);</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<TreatSpecificWarningsAsErrors>4316</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>../../../../../../libs/$(TargetName)_d.lib</ImportLibrary>
<AdditionalDependencies>Crypt32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GXGAPIOGL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<TreatSpecificWarningsAsErrors>4316</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ImportLibrary>../../../../../../libs/$(TargetName).lib</ImportLibrary>
<AdditionalDependencies>Crypt32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4f9f672f-000d-4c0d-924c-b061c63d0731}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{1a094981-1ffa-4742-b363-8cd78a0eb06d}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\source\ogl\GLPFN.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\ogl\GXContext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\ogl\GXIndexBuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\ogl\GXRenderBuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\ogl\GXShader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\ogl\GXVertexBuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\ogl\GXVertexDeclaration.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\source\graphix.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\source\ogl\dllmain.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\ogl\GLPFN.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\ogl\GXContext.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\ogl\GXIndexBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\ogl\GXRenderBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\ogl\GXShader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\ogl\GXVertexBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\source\ogl\GXVertexDeclaration.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
#include "GXBlendState.h"
void CGXBlendState::Release()
{
--m_uRefCount;
if(!m_uRefCount)
{
m_pRender->destroyBlendState(this);
}
}
CGXBlendState::~CGXBlendState()
{
--m_uRefCount;
if(!m_uRefCount)
{
mem_release(m_pStateBlock);
}
}
#ifndef _CGXBlendState_H_
#define _CGXBlendState_H_
#include "GXContext.h"
class CGXBlendState: public IGXBlendState
{
friend class CGXContext;
CGXBlendState(CGXContext * pRender):m_pRender(pRender)
{
};
~CGXBlendState();
CGXContext * m_pRender;
IDirect3DStateBlock9 *m_pStateBlock = NULL;
public:
void Release();
};
#endif
This diff is collapsed.
#ifndef _CGXContext_H_
#define _CGXContext_H_
#include <graphix/graphix.h>
#include <common/array.h>
#include <d3d9.h>
#include <d3dx9.h>
#include <dxerr9.h>
#if defined(_WINDOWS)
# define WIN32_LEAN_AND_MEAN
# include <Windows.h>
# pragma comment(lib, "d3d9.lib")
# pragma comment(lib, "DxErr9.lib")
# pragma comment(lib, "d3dx9.lib")
#endif
enum GX_LOG
{
GX_LOG_INFO,
GX_LOG_WARN,
GX_LOG_ERROR
};
#define GX_SYNCFLAG_NO_SHADER 0x00000001
#define DX_CALL(code) ([](HRESULT hr, const char *szCode){if(FAILED(hr)){CGXContext::logDXcall(szCode, hr);}return(hr);})((code), #code)
class CGXContext: public IGXContext
{
protected:
~CGXContext();
public:
BOOL initContext(SXWINDOW wnd, int iWidth, int iHeight, bool isWindowed);
CGXContext();
void Release();
void resize(int iWidth, int iHeight, bool isWindowed);
void swapBuffers();
bool beginFrame();
void endFrame();
bool canBeginFrame();
bool wasReset();
void clear(UINT what, GXCOLOR color = 0, float fDepth = 1.0f, UINT uStencil = 0);
IGXVertexBuffer * createVertexBuffer(size_t size, UINT flags, void * pInitData = NULL);
IGXIndexBuffer * createIndexBuffer(size_t size, UINT flags, GXINDEXTYPE it, void * pInitData = NULL);
void destroyIndexBuffer(IGXIndexBuffer * pBuff);
void destroyVertexBuffer(IGXVertexBuffer * pBuff);
IGXVertexDeclaration * createVertexDeclaration(const GXVERTEXELEMENT * pDecl);
void destroyVertexDeclaration(IGXVertexDeclaration * pDecl);
void setIndexBuffer(IGXIndexBuffer * pBuff);
void setRenderBuffer(IGXRenderBuffer * pBuff);
//void setVertexBuffers(UINT startSlot, UINT countSlots, IDSRvertexBuffer ** pBuff);
//void setInputLayout(IDSGvertexDeclaration * pDecl);
void drawIndexed(UINT uVertexCount, UINT uPrimitiveCount, UINT uStartIndexLocation, int iBaseVertexLocation);
void drawIndexedInstanced(UINT uInstanceCount, UINT uVertexCount, UINT uPrimitiveCount, UINT uStartIndexLocation, int iBaseVertexLocation);
void drawPrimitive(UINT uStartVertex, UINT uPrimitiveCount);
void drawPrimitiveInstanced(UINT uInstanceCount, UINT uStartVertex, UINT uPrimitiveCount);
void setPrimitiveTopology(GXPT pt);
//IGXShader * createShader(const char * pName, UINT flags = 0);
//void destroyShader(IGXShader * pSH);
//void setShader(IGXShader * pSH);
IGXVertexShader * createVertexShader(const char * szFile, GXMACRO *pDefs = NULL);
IGXVertexShader * createVertexShaderFromString(const char * szCode, GXMACRO *pDefs = NULL);
IGXVertexShader * createVertexShader(void *pData, UINT uSize);
void destroyVertexShader(IGXVertexShader * pSH);
IGXPixelShader * createPixelShader(const char * szFile, GXMACRO *pDefs = NULL);
IGXPixelShader * createPixelShaderFromString(const char * szCode, GXMACRO *pDefs = NULL);
IGXPixelShader * createPixelShader(void *pData, UINT uSize);
void destroyPixelShader(IGXPixelShader * pSH);
//void setVertexShader(IGXVertexShader * pSH);
//void setPixelShader(IGXPixelShader * pSH);
IGXShader *createShader(IGXVertexShader *pVS = NULL, IGXPixelShader *pPS = NULL);
void destroyShader(IGXShader *pSH);
void setShader(IGXShader *pSH);
IGXShader *getShader();
IGXRenderBuffer * createRenderBuffer(UINT countSlots, IGXVertexBuffer ** pBuff, IGXVertexDeclaration * pDecl);
void destroyRenderBuffer(IGXRenderBuffer * pDecl);
IGXDepthStencilSurface *createDepthStencilSurface(UINT uWidth, UINT uHeight, GXFORMAT format, GXMULTISAMPLE_TYPE multisampleType, bool bAutoResize = false);
void destroyDepthStencilSurface(IGXDepthStencilSurface *pSurface);
void setDepthStencilSurface(IGXDepthStencilSurface *pSurface);
IGXDepthStencilSurface *getDepthStencilSurface();
void setColorTarget(IGXSurface *pSurf, UINT idx = 0);
IGXSurface *getColorTarget(UINT idx = 0);
IGXTexture2D *createTexture2D(UINT uWidth, UINT uHeight, UINT uMipLevels, UINT uTexUsageFlags, GXFORMAT format, void * pInitData = NULL);
IGXTextureCube *createTextureCube(UINT uSize, UINT uMipLevels, UINT uTexUsageFlags, GXFORMAT format, void * pInitData = NULL);
void destroyTexture2D(IGXTexture2D * pTexture);
void destroyTextureCube(IGXTextureCube * pTexture);
IGXTexture2D *createTexture2DFromFile(const char *szFileName, UINT uTexUsageFlags, bool bAllowNonPowerOf2 = false);