jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed all references of the old d3d11 filenames to the new filenames

master
jp9000 2013-10-10 08:01:09 -07:00
parent 47e0700f3f
commit 904725390a
12 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libobs-d3d11/d3d11-indexbuffer.cpp
View File

@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include "GS_D3D11SubSystem.hpp"
#include "d3d11-subsystem.hpp"
void gs_index_buffer::InitBuffer()
{

2
libobs-d3d11/d3d11-samplerstate.cpp
View File

@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include "GS_D3D11SubSystem.hpp"
#include "d3d11-subsystem.hpp"
#include "graphics/vec4.h"
const D3D11_TEXTURE_ADDRESS_MODE convertAddressMode[] =

4
libobs-d3d11/d3d11-shader.cpp
View File

@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include "GS_D3D11SubSystem.hpp"
#include "GS_D3D11ShaderProcessor.hpp"
#include "d3d11-subsystem.hpp"
#include "d3d11-shaderprocessor.hpp"
#include "graphics/vec2.h"
#include "graphics/vec3.h"
#include "graphics/matrix3.h"

4
libobs-d3d11/d3d11-shaderprocessor.cpp
View File

@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include "GS_D3D11SubSystem.hpp"
#include "GS_D3D11ShaderProcessor.hpp"
#include "d3d11-subsystem.hpp"
#include "d3d11-shaderprocessor.hpp"
#include <sstream>
using namespace std;

2
libobs-d3d11/d3d11-stagesurf.cpp
View File

@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include "GS_D3D11SubSystem.hpp"
#include "d3d11-subsystem.hpp"
gs_stage_surface::gs_stage_surface(device_t device, uint32_t width,
uint32_t height, gs_color_format colorFormat)

2
libobs-d3d11/d3d11-subsystem.cpp
View File

@ -18,7 +18,7 @@
#include "util/base.h"
#include "util/platform.h"
#include "graphics/matrix3.h"
#include "GS_D3D11SubSystem.hpp"
#include "d3d11-subsystem.hpp"
static const IID dxgiFactory2 =
{0x50c83a1c, 0xe072, 0x4c48, {0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0}};

2
libobs-d3d11/d3d11-subsystem.hpp
View File

@ -37,7 +37,7 @@ struct shader_var;
struct shader_sampler;
struct gs_vertex_shader;
#include "GS_D3D11Exports.h"
#include "d3d11-exports.h"
using namespace std;

2
libobs-d3d11/d3d11-texture2d.cpp
View File

@ -16,7 +16,7 @@
******************************************************************************/
#include "util/base.h"
#include "GS_D3D11SubSystem.hpp"
#include "d3d11-subsystem.hpp"
void gs_texture_2d::InitSRD(vector<D3D11_SUBRESOURCE_DATA> &srd, void **data)
{

2
libobs-d3d11/d3d11-vertexbuffer.cpp
View File

@ -17,7 +17,7 @@
#include "util/base.h"
#include "graphics/vec3.h"
#include "GS_D3D11SubSystem.hpp"
#include "d3d11-subsystem.hpp"
static inline void PushBuffer(vector<ID3D11Buffer*> &buffers,
vector<uint32_t> &strides, ID3D11Buffer *buffer,

2
libobs-d3d11/d3d11-zstencilbuffer.cpp
View File

@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include "GS_D3D11SubSystem.hpp"
#include "d3d11-subsystem.hpp"
void gs_zstencil_buffer::InitBuffer()
{

32
vs/2010/libobs-d3d11/libobs-d3d11.vcxproj
View File

@ -18,6 +18,22 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\libobs-d3d11\d3d11-exports.h" />
<ClInclude Include="..\..\..\libobs-d3d11\d3d11-shaderprocessor.hpp" />
<ClInclude Include="..\..\..\libobs-d3d11\d3d11-subsystem.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-indexbuffer.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-samplerstate.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-shader.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-shaderprocessor.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-stagesurf.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-subsystem.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-texture2d.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-vertexbuffer.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-zstencilbuffer.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{68A84F9A-5B89-4E7D-8183-87FEA5DC65F6}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
@ -158,22 +174,6 @@
<AdditionalDependencies>d3d11.lib;dxgi.lib;d3dcompiler.lib;libobs.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11IndexBuffer.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11SamplerState.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11Shader.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11ShaderProcessor.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11StageSurf.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11SubSystem.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11Texture2D.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11VertexBuffer.cpp" />
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11ZStencilBuffer.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\libobs-d3d11\GS_D3D11Exports.h" />
<ClInclude Include="..\..\..\libobs-d3d11\GS_D3D11ShaderProcessor.hpp" />
<ClInclude Include="..\..\..\libobs-d3d11\GS_D3D11SubSystem.hpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

72
vs/2010/libobs-d3d11/libobs-d3d11.vcxproj.filters
View File

@ -15,43 +15,43 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11Shader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11ShaderProcessor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11StageSurf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11SubSystem.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11Texture2D.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11VertexBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11ZStencilBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11IndexBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\GS_D3D11SamplerState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClInclude Include="..\..\..\libobs-d3d11\d3d11-exports.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\libobs-d3d11\d3d11-shaderprocessor.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\libobs-d3d11\d3d11-subsystem.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\libobs-d3d11\GS_D3D11ShaderProcessor.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\libobs-d3d11\GS_D3D11SubSystem.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\libobs-d3d11\GS_D3D11Exports.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-indexbuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-samplerstate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-shader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-shaderprocessor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-stagesurf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-subsystem.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-texture2d.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-vertexbuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\libobs-d3d11\d3d11-zstencilbuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>