summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authorStevoisiak <Stevoisiak@gmail.com>2014-11-14 14:46:49 -0500
committerStevoisiak <S.Vascellaro@gmail.com>2014-11-24 17:16:59 -0500
commit6da394a4d0891ed30fbb08f4ec853f40699f7033 (patch)
tree3e95fff7fde66a1e121e2aa78b5c221fab8be8c9 /Source/Core/VideoBackends
parent60e9301f40601a1a3d6546a37ea71f18a43f9b3b (diff)
More formatting and consistency fixes
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/D3D/D3DBase.h8
-rw-r--r--Source/Core/VideoBackends/D3D/D3DState.cpp6
-rw-r--r--Source/Core/VideoBackends/D3D/D3DTexture.cpp18
-rw-r--r--Source/Core/VideoBackends/D3D/PerfQuery.cpp8
-rw-r--r--Source/Core/VideoBackends/D3D/VertexShaderCache.cpp6
-rw-r--r--Source/Core/VideoBackends/D3D/VideoBackend.h2
-rw-r--r--Source/Core/VideoBackends/OGL/ProgramShaderCache.h2
-rw-r--r--Source/Core/VideoBackends/OGL/TextureConverter.cpp2
-rw-r--r--Source/Core/VideoBackends/Software/EfbInterface.cpp2
9 files changed, 24 insertions, 30 deletions
diff --git a/Source/Core/VideoBackends/D3D/D3DBase.h b/Source/Core/VideoBackends/D3D/D3DBase.h
index 2f9f15b623..05190bd5d4 100644
--- a/Source/Core/VideoBackends/D3D/D3DBase.h
+++ b/Source/Core/VideoBackends/D3D/D3DBase.h
@@ -61,7 +61,7 @@ unsigned int GetMaxTextureSize();
HRESULT SetFullscreenState(bool enable_fullscreen);
HRESULT GetFullscreenState(bool* fullscreen_state);
-// Ihis function will assign a name to the given resource.
+// This function will assign a name to the given resource.
// The DirectX debug layer will make it easier to identify resources that way,
// e.g. when listing up all resources who have unreleased references.
template <typename T>
@@ -76,11 +76,11 @@ void SetDebugObjectName(T resource, const char* name)
} // namespace D3D
-typedef HRESULT (WINAPI *CREATEDXGIFACTORY)(REFIID, void**);
+typedef HRESULT (WINAPI* CREATEDXGIFACTORY)(REFIID, void**);
extern CREATEDXGIFACTORY PCreateDXGIFactory;
-typedef HRESULT (WINAPI *D3D11CREATEDEVICE)(IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT, CONST D3D_FEATURE_LEVEL*, UINT, UINT, ID3D11Device**, D3D_FEATURE_LEVEL*, ID3D11DeviceContext**);
+typedef HRESULT (WINAPI* D3D11CREATEDEVICE)(IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT, CONST D3D_FEATURE_LEVEL*, UINT, UINT, ID3D11Device**, D3D_FEATURE_LEVEL*, ID3D11DeviceContext**);
-typedef HRESULT (WINAPI *D3DREFLECT)(LPCVOID, SIZE_T, REFIID, void**);
+typedef HRESULT (WINAPI* D3DREFLECT)(LPCVOID, SIZE_T, REFIID, void**);
extern D3DREFLECT PD3DReflect;
extern pD3DCompile PD3DCompile;
diff --git a/Source/Core/VideoBackends/D3D/D3DState.cpp b/Source/Core/VideoBackends/D3D/D3DState.cpp
index bf250c52d0..563f94cd9d 100644
--- a/Source/Core/VideoBackends/D3D/D3DState.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DState.cpp
@@ -183,9 +183,7 @@ ID3D11BlendState* StateCache::Get(BlendState state)
auto it = m_blend.find(state.packed);
if (it != m_blend.end())
- {
return it->second;
- }
D3D11_BLEND_DESC blenddc = CD3D11_BLEND_DESC(CD3D11_DEFAULT());
@@ -256,9 +254,7 @@ ID3D11RasterizerState* StateCache::Get(RasterizerState state)
auto it = m_raster.find(state.packed);
if (it != m_raster.end())
- {
return it->second;
- }
D3D11_RASTERIZER_DESC rastdc = CD3D11_RASTERIZER_DESC(state.wireframe ? D3D11_FILL_WIREFRAME : D3D11_FILL_SOLID,
state.cull_mode,
@@ -279,9 +275,7 @@ ID3D11DepthStencilState* StateCache::Get(ZMode state)
auto it = m_depth.find(state.hex);
if (it != m_depth.end())
- {
return it->second;
- }
D3D11_DEPTH_STENCIL_DESC depthdc = CD3D11_DEPTH_STENCIL_DESC(CD3D11_DEFAULT());
diff --git a/Source/Core/VideoBackends/D3D/D3DTexture.cpp b/Source/Core/VideoBackends/D3D/D3DTexture.cpp
index d08c850187..e1c94d5974 100644
--- a/Source/Core/VideoBackends/D3D/D3DTexture.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DTexture.cpp
@@ -43,9 +43,12 @@ D3DTexture2D* D3DTexture2D::Create(unsigned int width, unsigned int height, D3D1
HRESULT hr;
D3D11_CPU_ACCESS_FLAG cpuflags;
- if (usage == D3D11_USAGE_STAGING) cpuflags = (D3D11_CPU_ACCESS_FLAG)((int)D3D11_CPU_ACCESS_WRITE|(int)D3D11_CPU_ACCESS_READ);
- else if (usage == D3D11_USAGE_DYNAMIC) cpuflags = D3D11_CPU_ACCESS_WRITE;
- else cpuflags = (D3D11_CPU_ACCESS_FLAG)0;
+ if (usage == D3D11_USAGE_STAGING)
+ cpuflags = (D3D11_CPU_ACCESS_FLAG)((int)D3D11_CPU_ACCESS_WRITE|(int)D3D11_CPU_ACCESS_READ);
+ else if (usage == D3D11_USAGE_DYNAMIC)
+ cpuflags = D3D11_CPU_ACCESS_WRITE;
+ else
+ cpuflags = (D3D11_CPU_ACCESS_FLAG)0;
D3D11_TEXTURE2D_DESC texdesc = CD3D11_TEXTURE2D_DESC(fmt, width, height, 1, levels, bind, usage, cpuflags);
hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &pTexture);
if (FAILED(hr))
@@ -90,9 +93,12 @@ D3DTexture2D::D3DTexture2D(ID3D11Texture2D* texptr, D3D11_BIND_FLAG bind,
D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc = CD3D11_SHADER_RESOURCE_VIEW_DESC(srv_dim, srv_format);
D3D11_DEPTH_STENCIL_VIEW_DESC dsv_desc = CD3D11_DEPTH_STENCIL_VIEW_DESC(dsv_dim, dsv_format);
D3D11_RENDER_TARGET_VIEW_DESC rtv_desc = CD3D11_RENDER_TARGET_VIEW_DESC(rtv_dim, rtv_format);
- if (bind & D3D11_BIND_SHADER_RESOURCE) D3D::device->CreateShaderResourceView(tex, &srv_desc, &srv);
- if (bind & D3D11_BIND_RENDER_TARGET) D3D::device->CreateRenderTargetView(tex, &rtv_desc, &rtv);
- if (bind & D3D11_BIND_DEPTH_STENCIL) D3D::device->CreateDepthStencilView(tex, &dsv_desc, &dsv);
+ if (bind & D3D11_BIND_SHADER_RESOURCE)
+ D3D::device->CreateShaderResourceView(tex, &srv_desc, &srv);
+ if (bind & D3D11_BIND_RENDER_TARGET)
+ D3D::device->CreateRenderTargetView(tex, &rtv_desc, &rtv);
+ if (bind & D3D11_BIND_DEPTH_STENCIL)
+ D3D::device->CreateDepthStencilView(tex, &dsv_desc, &dsv);
tex->AddRef();
}
diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.cpp b/Source/Core/VideoBackends/D3D/PerfQuery.cpp
index 61a501d640..d80d934c7c 100644
--- a/Source/Core/VideoBackends/D3D/PerfQuery.cpp
+++ b/Source/Core/VideoBackends/D3D/PerfQuery.cpp
@@ -72,21 +72,13 @@ u32 PerfQuery::GetQueryResult(PerfQueryType type)
u32 result = 0;
if (type == PQ_ZCOMP_INPUT_ZCOMPLOC || type == PQ_ZCOMP_OUTPUT_ZCOMPLOC)
- {
result = m_results[PQG_ZCOMP_ZCOMPLOC];
- }
else if (type == PQ_ZCOMP_INPUT || type == PQ_ZCOMP_OUTPUT)
- {
result = m_results[PQG_ZCOMP];
- }
else if (type == PQ_BLEND_INPUT)
- {
result = m_results[PQG_ZCOMP] + m_results[PQG_ZCOMP_ZCOMPLOC];
- }
else if (type == PQ_EFB_COPY_CLOCKS)
- {
result = m_results[PQG_EFB_COPY_CLOCKS];
- }
return result / 4;
}
diff --git a/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp b/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp
index 4758d2e630..d565d50c03 100644
--- a/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp
+++ b/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp
@@ -125,7 +125,8 @@ void VertexShaderCache::Init()
D3D::CompileVertexShader(simple_shader_code, &blob);
D3D::device->CreateInputLayout(simpleelems, 2, blob->Data(), blob->Size(), &SimpleLayout);
SimpleVertexShader = D3D::CreateVertexShaderFromByteCode(blob);
- if (SimpleLayout == nullptr || SimpleVertexShader == nullptr) PanicAlert("Failed to create simple vertex shader or input layout at %s %d\n", __FILE__, __LINE__);
+ if (SimpleLayout == nullptr || SimpleVertexShader == nullptr)
+ PanicAlert("Failed to create simple vertex shader or input layout at %s %d\n", __FILE__, __LINE__);
blob->Release();
D3D::SetDebugObjectName((ID3D11DeviceChild*)SimpleVertexShader, "simple vertex shader");
D3D::SetDebugObjectName((ID3D11DeviceChild*)SimpleLayout, "simple input layout");
@@ -133,7 +134,8 @@ void VertexShaderCache::Init()
D3D::CompileVertexShader(clear_shader_code, &blob);
D3D::device->CreateInputLayout(clearelems, 2, blob->Data(), blob->Size(), &ClearLayout);
ClearVertexShader = D3D::CreateVertexShaderFromByteCode(blob);
- if (ClearLayout == nullptr || ClearVertexShader == nullptr) PanicAlert("Failed to create clear vertex shader or input layout at %s %d\n", __FILE__, __LINE__);
+ if (ClearLayout == nullptr || ClearVertexShader == nullptr)
+ PanicAlert("Failed to create clear vertex shader or input layout at %s %d\n", __FILE__, __LINE__);
blob->Release();
D3D::SetDebugObjectName((ID3D11DeviceChild*)ClearVertexShader, "clear vertex shader");
D3D::SetDebugObjectName((ID3D11DeviceChild*)ClearLayout, "clear input layout");
diff --git a/Source/Core/VideoBackends/D3D/VideoBackend.h b/Source/Core/VideoBackends/D3D/VideoBackend.h
index d28f1b545f..862e8ca373 100644
--- a/Source/Core/VideoBackends/D3D/VideoBackend.h
+++ b/Source/Core/VideoBackends/D3D/VideoBackend.h
@@ -8,7 +8,7 @@ namespace DX11
class VideoBackend : public VideoBackendHardware
{
- bool Initialize(void *) override;
+ bool Initialize(void*) override;
void Shutdown() override;
std::string GetName() const override;
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
index dd376142be..cab5107eea 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
@@ -52,7 +52,7 @@ struct SHADER
glDeleteProgram(glprogid);
glprogid = 0;
}
- GLuint glprogid; // opengl program id
+ GLuint glprogid; // OpenGL program id
std::string strvprog, strpprog;
diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp
index 0b7275eaa4..1404ec92eb 100644
--- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp
+++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp
@@ -56,7 +56,7 @@ static void CreatePrograms()
*
* This shader doesn't really match what the GameCube does internally in the
* copy pipeline.
- * 1. It uses Opengl's built in filtering when yscaling, someone could work
+ * 1. It uses OpenGL's built in filtering when yscaling, someone could work
* out how the copypipeline does it's filtering and implement it correctly
* in this shader.
* 2. Deflickering isn't implemented, a futher filtering over 3 lines.
diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp
index fad9660c14..b3cd96acf3 100644
--- a/Source/Core/VideoBackends/Software/EfbInterface.cpp
+++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp
@@ -553,7 +553,7 @@ namespace EfbInterface
}
}
- // Like CopyToXFB, but we copy directly into the opengl color texture without going via GameCube main memory or doing a yuyv conversion
+ // Like CopyToXFB, but we copy directly into the OpenGL color texture without going via GameCube main memory or doing a yuyv conversion
void BypassXFB(u8* texture, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma)
{
if (fbWidth*fbHeight > MAX_XFB_WIDTH*MAX_XFB_HEIGHT)