Fixed code style mistakes.
TRAC #22251
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
Author: Geoff Lang
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1672 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/renderer/RenderStateCache.cpp b/src/libGLESv2/renderer/RenderStateCache.cpp
index 92596b6..dce4764 100644
--- a/src/libGLESv2/renderer/RenderStateCache.cpp
+++ b/src/libGLESv2/renderer/RenderStateCache.cpp
@@ -37,7 +37,7 @@
clear();
}
-void RenderStateCache::initialize(ID3D11Device* device)
+void RenderStateCache::initialize(ID3D11Device *device)
{
clear();
mDevice = device;
@@ -145,7 +145,7 @@
blendState.colorMaskAlpha);
}
- ID3D11BlendState* dx11BlendState = NULL;
+ ID3D11BlendState *dx11BlendState = NULL;
HRESULT result = mDevice->CreateBlendState(&blendDesc, &dx11BlendState);
if (FAILED(result) || !dx11BlendState)
{
@@ -225,7 +225,7 @@
rasterDesc.MultisampleEnable = TRUE;
rasterDesc.AntialiasedLineEnable = FALSE;
- ID3D11RasterizerState* dx11RasterizerState = NULL;
+ ID3D11RasterizerState *dx11RasterizerState = NULL;
HRESULT result = mDevice->CreateRasterizerState(&rasterDesc, &dx11RasterizerState);
if (FAILED(result) || !dx11RasterizerState)
{
@@ -253,7 +253,7 @@
return memcmp(&a, &b, sizeof(gl::DepthStencilState)) == 0;
}
-ID3D11DepthStencilState* RenderStateCache::getDepthStencilState(const gl::DepthStencilState &dsState)
+ID3D11DepthStencilState *RenderStateCache::getDepthStencilState(const gl::DepthStencilState &dsState)
{
if (!mDevice)
{
@@ -303,7 +303,7 @@
dsDesc.BackFace.StencilPassOp = gl_d3d11::ConvertStencilOp(dsState.stencilBackPassDepthPass);
dsDesc.BackFace.StencilFunc = gl_d3d11::ConvertComparison(dsState.stencilBackFunc);
- ID3D11DepthStencilState* dx11DepthStencilState = NULL;
+ ID3D11DepthStencilState *dx11DepthStencilState = NULL;
HRESULT result = mDevice->CreateDepthStencilState(&dsDesc, &dx11DepthStencilState);
if (FAILED(result) || !dx11DepthStencilState)
{
@@ -331,7 +331,7 @@
return memcmp(&a, &b, sizeof(gl::DepthStencilState)) == 0;
}
-ID3D11SamplerState* RenderStateCache::getSamplerState(const gl::SamplerState &samplerState)
+ID3D11SamplerState *RenderStateCache::getSamplerState(const gl::SamplerState &samplerState)
{
if (!mDevice)
{
diff --git a/src/libGLESv2/renderer/RenderStateCache.h b/src/libGLESv2/renderer/RenderStateCache.h
index 05672b3..5e52726 100644
--- a/src/libGLESv2/renderer/RenderStateCache.h
+++ b/src/libGLESv2/renderer/RenderStateCache.h
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2012-2013 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
@@ -25,15 +25,15 @@
RenderStateCache();
virtual ~RenderStateCache();
- void initialize(ID3D11Device* device);
+ void initialize(ID3D11Device *device);
void clear();
// Increments refcount on the returned blend state, Release() must be called.
ID3D11BlendState *getBlendState(const gl::BlendState &blendState);
ID3D11RasterizerState *getRasterizerState(const gl::RasterizerState &rasterState,
bool scissorEnabled, unsigned int depthSize);
- ID3D11DepthStencilState* getDepthStencilState(const gl::DepthStencilState &dsState);
- ID3D11SamplerState* getSamplerState(const gl::SamplerState &samplerState);
+ ID3D11DepthStencilState *getDepthStencilState(const gl::DepthStencilState &dsState);
+ ID3D11SamplerState *getSamplerState(const gl::SamplerState &samplerState);
private:
DISALLOW_COPY_AND_ASSIGN(RenderStateCache);
@@ -96,7 +96,7 @@
SamplerStateEqualityFunction> SamplerStateMap;
SamplerStateMap mSamplerStateCache;
- ID3D11Device* mDevice;
+ ID3D11Device *mDevice;
};
}