From 904725390ad454b83dd047e0852770f2d8ecb670 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Thu, 10 Oct 2013 08:01:09 -0700 Subject: [PATCH] changed all references of the old d3d11 filenames to the new filenames --- libobs-d3d11/d3d11-indexbuffer.cpp | 2 +- libobs-d3d11/d3d11-samplerstate.cpp | 2 +- libobs-d3d11/d3d11-shader.cpp | 4 +- libobs-d3d11/d3d11-shaderprocessor.cpp | 4 +- libobs-d3d11/d3d11-stagesurf.cpp | 2 +- libobs-d3d11/d3d11-subsystem.cpp | 2 +- libobs-d3d11/d3d11-subsystem.hpp | 2 +- libobs-d3d11/d3d11-texture2d.cpp | 2 +- libobs-d3d11/d3d11-vertexbuffer.cpp | 2 +- libobs-d3d11/d3d11-zstencilbuffer.cpp | 2 +- vs/2010/libobs-d3d11/libobs-d3d11.vcxproj | 32 ++++----- .../libobs-d3d11/libobs-d3d11.vcxproj.filters | 72 +++++++++---------- 12 files changed, 64 insertions(+), 64 deletions(-) diff --git a/libobs-d3d11/d3d11-indexbuffer.cpp b/libobs-d3d11/d3d11-indexbuffer.cpp index 7e15adcc4..3bb110df2 100644 --- a/libobs-d3d11/d3d11-indexbuffer.cpp +++ b/libobs-d3d11/d3d11-indexbuffer.cpp @@ -15,7 +15,7 @@ along with this program. If not, see . ******************************************************************************/ -#include "GS_D3D11SubSystem.hpp" +#include "d3d11-subsystem.hpp" void gs_index_buffer::InitBuffer() { diff --git a/libobs-d3d11/d3d11-samplerstate.cpp b/libobs-d3d11/d3d11-samplerstate.cpp index bf6d6f994..1746c66bc 100644 --- a/libobs-d3d11/d3d11-samplerstate.cpp +++ b/libobs-d3d11/d3d11-samplerstate.cpp @@ -15,7 +15,7 @@ along with this program. If not, see . ******************************************************************************/ -#include "GS_D3D11SubSystem.hpp" +#include "d3d11-subsystem.hpp" #include "graphics/vec4.h" const D3D11_TEXTURE_ADDRESS_MODE convertAddressMode[] = diff --git a/libobs-d3d11/d3d11-shader.cpp b/libobs-d3d11/d3d11-shader.cpp index 86d55403f..947f6c9f1 100644 --- a/libobs-d3d11/d3d11-shader.cpp +++ b/libobs-d3d11/d3d11-shader.cpp @@ -15,8 +15,8 @@ along with this program. If not, see . ******************************************************************************/ -#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" diff --git a/libobs-d3d11/d3d11-shaderprocessor.cpp b/libobs-d3d11/d3d11-shaderprocessor.cpp index ce771d22d..4eacaec37 100644 --- a/libobs-d3d11/d3d11-shaderprocessor.cpp +++ b/libobs-d3d11/d3d11-shaderprocessor.cpp @@ -15,8 +15,8 @@ along with this program. If not, see . ******************************************************************************/ -#include "GS_D3D11SubSystem.hpp" -#include "GS_D3D11ShaderProcessor.hpp" +#include "d3d11-subsystem.hpp" +#include "d3d11-shaderprocessor.hpp" #include using namespace std; diff --git a/libobs-d3d11/d3d11-stagesurf.cpp b/libobs-d3d11/d3d11-stagesurf.cpp index b281b3faa..f0a00d848 100644 --- a/libobs-d3d11/d3d11-stagesurf.cpp +++ b/libobs-d3d11/d3d11-stagesurf.cpp @@ -15,7 +15,7 @@ along with this program. If not, see . ******************************************************************************/ -#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) diff --git a/libobs-d3d11/d3d11-subsystem.cpp b/libobs-d3d11/d3d11-subsystem.cpp index 62b6e8442..0a955c3f9 100644 --- a/libobs-d3d11/d3d11-subsystem.cpp +++ b/libobs-d3d11/d3d11-subsystem.cpp @@ -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}}; diff --git a/libobs-d3d11/d3d11-subsystem.hpp b/libobs-d3d11/d3d11-subsystem.hpp index 118f55daa..6b436fd0d 100644 --- a/libobs-d3d11/d3d11-subsystem.hpp +++ b/libobs-d3d11/d3d11-subsystem.hpp @@ -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; diff --git a/libobs-d3d11/d3d11-texture2d.cpp b/libobs-d3d11/d3d11-texture2d.cpp index 92ed77af3..2676676ca 100644 --- a/libobs-d3d11/d3d11-texture2d.cpp +++ b/libobs-d3d11/d3d11-texture2d.cpp @@ -16,7 +16,7 @@ ******************************************************************************/ #include "util/base.h" -#include "GS_D3D11SubSystem.hpp" +#include "d3d11-subsystem.hpp" void gs_texture_2d::InitSRD(vector &srd, void **data) { diff --git a/libobs-d3d11/d3d11-vertexbuffer.cpp b/libobs-d3d11/d3d11-vertexbuffer.cpp index 88e1f8b09..5c0864920 100644 --- a/libobs-d3d11/d3d11-vertexbuffer.cpp +++ b/libobs-d3d11/d3d11-vertexbuffer.cpp @@ -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 &buffers, vector &strides, ID3D11Buffer *buffer, diff --git a/libobs-d3d11/d3d11-zstencilbuffer.cpp b/libobs-d3d11/d3d11-zstencilbuffer.cpp index 496cb5448..22902b9e7 100644 --- a/libobs-d3d11/d3d11-zstencilbuffer.cpp +++ b/libobs-d3d11/d3d11-zstencilbuffer.cpp @@ -15,7 +15,7 @@ along with this program. If not, see . ******************************************************************************/ -#include "GS_D3D11SubSystem.hpp" +#include "d3d11-subsystem.hpp" void gs_zstencil_buffer::InitBuffer() { diff --git a/vs/2010/libobs-d3d11/libobs-d3d11.vcxproj b/vs/2010/libobs-d3d11/libobs-d3d11.vcxproj index f7f05309e..138fe45ba 100644 --- a/vs/2010/libobs-d3d11/libobs-d3d11.vcxproj +++ b/vs/2010/libobs-d3d11/libobs-d3d11.vcxproj @@ -18,6 +18,22 @@ x64 + + + + + + + + + + + + + + + + {68A84F9A-5B89-4E7D-8183-87FEA5DC65F6} Win32Proj @@ -158,22 +174,6 @@ d3d11.lib;dxgi.lib;d3dcompiler.lib;libobs.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - diff --git a/vs/2010/libobs-d3d11/libobs-d3d11.vcxproj.filters b/vs/2010/libobs-d3d11/libobs-d3d11.vcxproj.filters index 59a92ff8b..6488cd380 100644 --- a/vs/2010/libobs-d3d11/libobs-d3d11.vcxproj.filters +++ b/vs/2010/libobs-d3d11/libobs-d3d11.vcxproj.filters @@ -15,43 +15,43 @@ - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - + + Header Files + + + Header Files + + + Header Files + - - Header Files - - - Header Files - - - Header Files - + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + \ No newline at end of file