Renamed GpuPipelineState to GraphicsPipelineState

Source/BansheeCore/Include/BsCorePrerequisites.h

@@ -386,8 +386,8 @@ namespace BansheeEngine
 	class MorphShape;
 	class MorphChannel;
 	class CommandBuffer;
-	class GpuPipelineState;
-	class GpuPipelineStateCore;
+	class GraphicsPipelineState;
+	class GraphicsPipelineStateCore;
 	// Asset import
 	class SpecificImporter;
 	class Importer;

Source/BansheeCore/Include/BsGpuParamsSet.h

@@ -32,7 +32,7 @@ namespace BansheeEngine
 		typedef typename TGpuParamTextureType<Core>::Type TextureType;
 		typedef typename TGpuBufferType<Core>::Type BufferType;
 		typedef typename TGpuParamSamplerStateType<Core>::Type SamplerStateType;
-		typedef typename TPassTypes<Core>::GpuPipelineStateType GpuPipelineStateType;
+		typedef typename TPassTypes<Core>::GraphicsPipelineStateType GraphicsPipelineStateType;
 
 		/** Information about a parameter block buffer. */
 		struct BlockInfo

Source/BansheeCore/Include/BsGpuPipelineState.h

@@ -77,10 +77,11 @@ namespace BansheeEngine
 	};
 
 	/** 
-	 * Templated version of GpuPipelineState so it can be used for both core and non-core versions of the pipeline state. 
+	 * Templated version of GraphicsPipelineState so it can be used for both core and non-core versions of the pipeline
+	 * state. 
 	 */
 	template<bool Core>
-	class BS_CORE_EXPORT TGpuPipelineState
+	class BS_CORE_EXPORT TGraphicsPipelineState
     {
     public:
 		typedef typename TGpuPipelineStateTypes<Core>::BlendStateType BlendStateType;
@@ -89,7 +90,7 @@ namespace BansheeEngine
 		typedef typename TGpuPipelineStateTypes<Core>::GpuProgramType GpuProgramType;
 		typedef typename TGpuPipelineStateTypes<Core>::StateDescType StateDescType;
 
-		virtual ~TGpuPipelineState() { }
+		virtual ~TGraphicsPipelineState() { }
 
         bool hasVertexProgram() const { return mData.vertexProgram != nullptr; }
 		bool hasFragmentProgram() const { return mData.fragmentProgram != nullptr; }
@@ -111,8 +112,8 @@ namespace BansheeEngine
 		const SPtr<GpuPipelineParamInfo>& getParamInfo() const { return mParamInfo; }
 
 	protected:
-		TGpuPipelineState();
-		TGpuPipelineState(const StateDescType& desc);
+		TGraphicsPipelineState();
+		TGraphicsPipelineState(const StateDescType& desc);
 
 		StateDescType mData;
 		SPtr<GpuPipelineParamInfo> mParamInfo;
@@ -124,31 +125,31 @@ namespace BansheeEngine
 	 *  @{
 	 */
 
-	class GpuPipelineStateCore;
+	class GraphicsPipelineStateCore;
 
 	/**
 	 * Describes the state of the GPU pipeline that determines how are primitives rendered. It consists of programmable
 	 * states (vertex, fragment, geometry, etc. GPU programs), as well as a set of fixed states (blend, rasterizer, 
 	 * depth-stencil). Once created the state is immutable, and can be bound to RenderAPI for rendering.
 	 */
-    class BS_CORE_EXPORT GpuPipelineState : public CoreObject, public TGpuPipelineState<false>
+    class BS_CORE_EXPORT GraphicsPipelineState : public CoreObject, public TGraphicsPipelineState<false>
     {
 	public:
-		virtual ~GpuPipelineState() { }
+		virtual ~GraphicsPipelineState() { }
 
 		/**
 		 * Retrieves a core implementation of the pipeline object usable only from the core thread.
 		 *
 		 * @note	Core thread only.
 		 */
-		SPtr<GpuPipelineStateCore> getCore() const;
+		SPtr<GraphicsPipelineStateCore> getCore() const;
 
 		/** @copydoc RenderStateManager::createPipelineState */
-		static SPtr<GpuPipelineState> create(const PIPELINE_STATE_DESC& desc);
+		static SPtr<GraphicsPipelineState> create(const PIPELINE_STATE_DESC& desc);
 	protected:
 		friend class RenderStateManager;
 
-		GpuPipelineState(const PIPELINE_STATE_DESC& desc);
+		GraphicsPipelineState(const PIPELINE_STATE_DESC& desc);
 
 		/** @copydoc CoreObject::createCore */
 		virtual SPtr<CoreObjectCore> createCore() const;
@@ -160,15 +161,15 @@ namespace BansheeEngine
 	 *  @{
 	 */
 
-	/** Core thread version of a GpuPipelineState. */
-	class BS_CORE_EXPORT GpuPipelineStateCore : public CoreObjectCore, public TGpuPipelineState<true>
+	/** Core thread version of a GraphicsPipelineState. */
+	class BS_CORE_EXPORT GraphicsPipelineStateCore : public CoreObjectCore, public TGraphicsPipelineState<true>
 	{
 	public:
-		GpuPipelineStateCore(const PIPELINE_STATE_CORE_DESC& desc, GpuDeviceFlags deviceMask);
-		virtual ~GpuPipelineStateCore() { }
+		GraphicsPipelineStateCore(const PIPELINE_STATE_CORE_DESC& desc, GpuDeviceFlags deviceMask);
+		virtual ~GraphicsPipelineStateCore() { }
 
 		/** @copydoc RenderStateManager::createPipelineState */
-		static SPtr<GpuPipelineStateCore> create(const PIPELINE_STATE_CORE_DESC& desc, 
+		static SPtr<GraphicsPipelineStateCore> create(const PIPELINE_STATE_CORE_DESC& desc, 
 			GpuDeviceFlags deviceMask = GDF_DEFAULT);
 	};
 

Source/BansheeCore/Include/BsPass.h

@@ -69,7 +69,7 @@ namespace BansheeEngine
 		typedef SPtr<RasterizerState> RasterizerStateType;
 		typedef SPtr<DepthStencilState> DepthStencilStateType;
 		typedef SPtr<GpuProgram> GpuProgramType;
-		typedef SPtr<GpuPipelineState> GpuPipelineStateType;
+		typedef SPtr<GraphicsPipelineState> GraphicsPipelineStateType;
 		typedef PASS_DESC PassDescType;
 	};
 
@@ -80,7 +80,7 @@ namespace BansheeEngine
 		typedef SPtr<RasterizerStateCore> RasterizerStateType;
 		typedef SPtr<DepthStencilStateCore> DepthStencilStateType;
 		typedef SPtr<GpuProgramCore> GpuProgramType;
-		typedef SPtr<GpuPipelineStateCore> GpuPipelineStateType;
+		typedef SPtr<GraphicsPipelineStateCore> GraphicsPipelineStateType;
 		typedef PASS_DESC_CORE PassDescType;
 	};
 
@@ -101,7 +101,7 @@ namespace BansheeEngine
 		typedef typename TPassTypes<Core>::DepthStencilStateType DepthStencilStateType;
 		typedef typename TPassTypes<Core>::GpuProgramType GpuProgramType;
 		typedef typename TPassTypes<Core>::PassDescType PassDescType;
-		typedef typename TPassTypes<Core>::GpuPipelineStateType GpuPipelineStateType;
+		typedef typename TPassTypes<Core>::GraphicsPipelineStateType GraphicsPipelineStateType;
 
 		virtual ~TPass() { }
 
@@ -129,14 +129,14 @@ namespace BansheeEngine
 		const GpuProgramType& getDomainProgram() const { return mData.domainProgram; }
 		const GpuProgramType& getComputeProgram() const { return mData.computeProgram; }
 
-		const GpuPipelineStateType& getPipelineState() const { return mPipelineState; }
+		const GraphicsPipelineStateType& getPipelineState() const { return mPipelineState; }
 
 	protected:
 		TPass();
 		TPass(const PassDescType& desc);
 
 		PassDescType mData;
-		GpuPipelineStateType mPipelineState;
+		GraphicsPipelineStateType mPipelineState;
     };
 
 	/** @} */
@@ -167,7 +167,7 @@ namespace BansheeEngine
 
 		PassCore() { }
 		PassCore(const PASS_DESC_CORE& desc);
-		PassCore(const PASS_DESC_CORE& desc, const SPtr<GpuPipelineStateCore>& pipelineState);
+		PassCore(const PASS_DESC_CORE& desc, const SPtr<GraphicsPipelineStateCore>& pipelineState);
 
 		/** @copydoc CoreObjectCore::syncToCore */
 		void syncToCore(const CoreSyncData& data) override;

Source/BansheeCore/Include/BsRenderAPI.h

@@ -37,7 +37,7 @@ namespace BansheeEngine
 		static void setGpuParams(CoreAccessor& accessor, const SPtr<GpuParams>& gpuParams);
 
 		/** @see RenderAPICore::setGraphicsPipeline() */
-		static void setGraphicsPipeline(CoreAccessor& accessor, const SPtr<GpuPipelineState>& pipelineState);
+		static void setGraphicsPipeline(CoreAccessor& accessor, const SPtr<GraphicsPipelineState>& pipelineState);
 
 		/** @see RenderAPICore::setComputePipeline() */
 		static void setComputePipeline(CoreAccessor& accessor, const SPtr<GpuProgram>& computeProgram);
@@ -217,9 +217,9 @@ namespace BansheeEngine
 		 *									is executed immediately. Otherwise it is executed when executeCommands() is 
 		 *									called. Buffer must support graphics operations.
 		 *
-		 * @see		GpuPipelineState
+		 * @see		GraphicsPipelineState
 		 */
-		virtual void setGraphicsPipeline(const SPtr<GpuPipelineStateCore>& pipelineState,
+		virtual void setGraphicsPipeline(const SPtr<GraphicsPipelineStateCore>& pipelineState,
 			const SPtr<CommandBuffer>& commandBuffer = nullptr) = 0;
 
 		/**

Source/BansheeCore/Include/BsRenderStateManager.h

@@ -32,8 +32,8 @@ namespace BansheeEngine
 		/**	Creates and initializes a new BlendState. */
 		SPtr<BlendState> createBlendState(const BLEND_STATE_DESC& desc) const;
 
-		/**	Creates and initializes a new GpuPipelineState. */
-		SPtr<GpuPipelineState> createPipelineState(const PIPELINE_STATE_DESC& desc) const;
+		/**	Creates and initializes a new GraphicsPipelineState. */
+		SPtr<GraphicsPipelineState> createGraphicsPipelineState(const PIPELINE_STATE_DESC& desc) const;
 
 		/** Creates an uninitialized sampler state. Requires manual initialization after creation. */
 		SPtr<SamplerState> _createSamplerStatePtr(const SAMPLER_STATE_DESC& desc) const;
@@ -47,8 +47,8 @@ namespace BansheeEngine
 		/** Creates an uninitialized blend state. Requires manual initialization after creation. */
 		SPtr<BlendState> _createBlendStatePtr(const BLEND_STATE_DESC& desc) const;
 
-		/**	Creates an uninitialized GpuPipelineState. Requires manual initialization after creation. */
-		virtual SPtr<GpuPipelineState> _createPipelineState(const PIPELINE_STATE_DESC& desc) const;
+		/**	Creates an uninitialized GraphicsPipelineState. Requires manual initialization after creation. */
+		virtual SPtr<GraphicsPipelineState> _createGraphicsPipelineState(const PIPELINE_STATE_DESC& desc) const;
 
 		/** Gets a sampler state initialized with default options. */
 		const SPtr<SamplerState>& getDefaultSamplerState() const;
@@ -146,7 +146,7 @@ namespace BansheeEngine
 		 * @copydoc RenderStateManager::createPipelineState 
 		 * @param[in]	deviceMask		Mask that determines on which GPU devices should the object be created on.
 		 */
-		SPtr<GpuPipelineStateCore> createPipelineState(const PIPELINE_STATE_CORE_DESC& desc, 
+		SPtr<GraphicsPipelineStateCore> createPipelineState(const PIPELINE_STATE_CORE_DESC& desc, 
 			GpuDeviceFlags deviceMask = GDF_DEFAULT) const;
 
 		/** Creates an uninitialized sampler state. Requires manual initialization after creation. */
@@ -162,8 +162,8 @@ namespace BansheeEngine
 		/** Creates an uninitialized blend state. Requires manual initialization after creation. */
 		SPtr<BlendStateCore> _createBlendState(const BLEND_STATE_DESC& desc) const;
 
-		/**	Creates an uninitialized GpuPipelineState. Requires manual initialization after creation. */
-		virtual SPtr<GpuPipelineStateCore> _createPipelineState(const PIPELINE_STATE_CORE_DESC& desc, 
+		/**	Creates an uninitialized GraphicsPipelineState. Requires manual initialization after creation. */
+		virtual SPtr<GraphicsPipelineStateCore> _createPipelineState(const PIPELINE_STATE_CORE_DESC& desc, 
 			GpuDeviceFlags deviceMask = GDF_DEFAULT) const;
 
 		/** Gets a sampler state initialized with default options. */

Source/BansheeCore/Source/BsGpuParamsSet.cpp

@@ -474,7 +474,7 @@ namespace BansheeEngine
 		for (UINT32 i = 0; i < numPasses; i++)
 		{
 			SPtr<PassType> curPass = technique->getPass(i);
-			GpuPipelineStateType pipeline = curPass->getPipelineState();
+			GraphicsPipelineStateType pipeline = curPass->getPipelineState();
 
 			mPassParams[i] = GpuParamsType::create(pipeline->getParamInfo());
 		}

Source/BansheeCore/Source/BsGpuPipelineState.cpp

@@ -24,11 +24,11 @@ namespace BansheeEngine
 	}
 
 	template<bool Core>
-	TGpuPipelineState<Core>::TGpuPipelineState()
+	TGraphicsPipelineState<Core>::TGraphicsPipelineState()
 	{ }
 
 	template<bool Core>
-	TGpuPipelineState<Core>::TGpuPipelineState(const StateDescType& data)
+	TGraphicsPipelineState<Core>::TGraphicsPipelineState(const StateDescType& data)
 		:mData(data)
 	{
 		GPU_PIPELINE_PARAMS_DESC paramsDesc;
@@ -50,28 +50,28 @@ namespace BansheeEngine
 		mParamInfo = GpuPipelineParamInfo::create(paramsDesc);
 	}
 
-	template class TGpuPipelineState < false > ;
-	template class TGpuPipelineState < true >;
+	template class TGraphicsPipelineState < false > ;
+	template class TGraphicsPipelineState < true >;
 
-	GpuPipelineStateCore::GpuPipelineStateCore(const PIPELINE_STATE_CORE_DESC& desc, GpuDeviceFlags deviceMask)
-		:TGpuPipelineState(desc)
+	GraphicsPipelineStateCore::GraphicsPipelineStateCore(const PIPELINE_STATE_CORE_DESC& desc, GpuDeviceFlags deviceMask)
+		:TGraphicsPipelineState(desc)
 	{ }
 
-	SPtr<GpuPipelineStateCore> GpuPipelineStateCore::create(const PIPELINE_STATE_CORE_DESC& desc, GpuDeviceFlags deviceMask)
+	SPtr<GraphicsPipelineStateCore> GraphicsPipelineStateCore::create(const PIPELINE_STATE_CORE_DESC& desc, GpuDeviceFlags deviceMask)
 	{
 		return RenderStateCoreManager::instance().createPipelineState(desc, deviceMask);
 	}
 
-	GpuPipelineState::GpuPipelineState(const PIPELINE_STATE_DESC& desc)
-		:TGpuPipelineState(desc)
+	GraphicsPipelineState::GraphicsPipelineState(const PIPELINE_STATE_DESC& desc)
+		:TGraphicsPipelineState(desc)
 	{ }
 
-	SPtr<GpuPipelineStateCore> GpuPipelineState::getCore() const
+	SPtr<GraphicsPipelineStateCore> GraphicsPipelineState::getCore() const
 	{
-		return std::static_pointer_cast<GpuPipelineStateCore>(mCoreSpecific);
+		return std::static_pointer_cast<GraphicsPipelineStateCore>(mCoreSpecific);
 	}
 
-	SPtr<CoreObjectCore> GpuPipelineState::createCore() const
+	SPtr<CoreObjectCore> GraphicsPipelineState::createCore() const
 	{
 		PIPELINE_STATE_CORE_DESC desc;
 		convertPassDesc(mData, desc);
@@ -79,9 +79,9 @@ namespace BansheeEngine
 		return RenderStateCoreManager::instance()._createPipelineState(desc);
 	}
 
-	SPtr<GpuPipelineState> GpuPipelineState::create(const PIPELINE_STATE_DESC& desc)
+	SPtr<GraphicsPipelineState> GraphicsPipelineState::create(const PIPELINE_STATE_DESC& desc)
 	{
-		return RenderStateManager::instance().createPipelineState(desc);
+		return RenderStateManager::instance().createGraphicsPipelineState(desc);
 	}
 
 	GpuPipelineParamInfo::GpuPipelineParamInfo(const GPU_PIPELINE_PARAMS_DESC& desc)

Source/BansheeCore/Source/BsPass.cpp

@@ -99,7 +99,7 @@ namespace BansheeEngine
 		:TPass(desc)
 	{ }
 
-	PassCore::PassCore(const PASS_DESC_CORE& desc, const SPtr<GpuPipelineStateCore>& pipelineState)
+	PassCore::PassCore(const PASS_DESC_CORE& desc, const SPtr<GraphicsPipelineStateCore>& pipelineState)
 		:TPass(desc)
 	{
 		mPipelineState = pipelineState;
@@ -113,7 +113,7 @@ namespace BansheeEngine
 			PIPELINE_STATE_CORE_DESC desc;
 			convertPassDesc(mData, desc);
 
-			mPipelineState = GpuPipelineStateCore::create(desc);
+			mPipelineState = GraphicsPipelineStateCore::create(desc);
 		}
 
 		CoreObjectCore::initialize();
@@ -152,7 +152,7 @@ namespace BansheeEngine
 		PASS_DESC_CORE desc;
 		convertPassDesc(mData, desc);
 
-		SPtr<GpuPipelineStateCore> corePipeline;
+		SPtr<GraphicsPipelineStateCore> corePipeline;
 		if (mPipelineState != nullptr)
 			corePipeline = mPipelineState->getCore();
 
@@ -171,7 +171,7 @@ namespace BansheeEngine
 			PIPELINE_STATE_DESC desc;
 			convertPassDesc(mData, desc);
 
-			mPipelineState = GpuPipelineState::create(desc);
+			mPipelineState = GraphicsPipelineState::create(desc);
 		}
 
 		CoreObject::initialize();

Source/BansheeCore/Source/BsRenderAPI.cpp

@@ -23,7 +23,7 @@ namespace BansheeEngine
 			nullptr));
 	}
 
-	void RenderAPI::setGraphicsPipeline(CoreAccessor& accessor, const SPtr<GpuPipelineState>& pipelineState)
+	void RenderAPI::setGraphicsPipeline(CoreAccessor& accessor, const SPtr<GraphicsPipelineState>& pipelineState)
 	{
 		accessor.queueCommand(std::bind(&RenderAPICore::setGraphicsPipeline, RenderAPICore::instancePtr(),
 			pipelineState->getCore(), nullptr));

Source/BansheeCore/Source/BsRenderStateManager.cpp

@@ -40,9 +40,9 @@ namespace BansheeEngine
 		return state;
 	}
 
-	SPtr<GpuPipelineState> RenderStateManager::createPipelineState(const PIPELINE_STATE_DESC& desc) const
+	SPtr<GraphicsPipelineState> RenderStateManager::createGraphicsPipelineState(const PIPELINE_STATE_DESC& desc) const
 	{
-		SPtr<GpuPipelineState> state = _createPipelineState(desc);
+		SPtr<GraphicsPipelineState> state = _createGraphicsPipelineState(desc);
 		state->initialize();
 
 		return state;
@@ -80,10 +80,10 @@ namespace BansheeEngine
 		return blendState;
 	}
 
-	SPtr<GpuPipelineState> RenderStateManager::_createPipelineState(const PIPELINE_STATE_DESC& desc) const
+	SPtr<GraphicsPipelineState> RenderStateManager::_createGraphicsPipelineState(const PIPELINE_STATE_DESC& desc) const
 	{
-		SPtr<GpuPipelineState> pipelineState = 
-			bs_core_ptr<GpuPipelineState>(new (bs_alloc<GpuPipelineState>()) GpuPipelineState(desc));
+		SPtr<GraphicsPipelineState> pipelineState = 
+			bs_core_ptr<GraphicsPipelineState>(new (bs_alloc<GraphicsPipelineState>()) GraphicsPipelineState(desc));
 		pipelineState->_setThisPtr(pipelineState);
 
 		return pipelineState;
@@ -196,10 +196,10 @@ namespace BansheeEngine
 		return state;
 	}
 
-	SPtr<GpuPipelineStateCore> RenderStateCoreManager::createPipelineState(const PIPELINE_STATE_CORE_DESC& desc, 
+	SPtr<GraphicsPipelineStateCore> RenderStateCoreManager::createPipelineState(const PIPELINE_STATE_CORE_DESC& desc, 
 		GpuDeviceFlags deviceMask) const
 	{
-		SPtr<GpuPipelineStateCore> state = _createPipelineState(desc, deviceMask);
+		SPtr<GraphicsPipelineStateCore> state = _createPipelineState(desc, deviceMask);
 		state->initialize();
 
 		return state;
@@ -270,11 +270,11 @@ namespace BansheeEngine
 		return state;
 	}
 
-	SPtr<GpuPipelineStateCore> RenderStateCoreManager::_createPipelineState(const PIPELINE_STATE_CORE_DESC& desc,
+	SPtr<GraphicsPipelineStateCore> RenderStateCoreManager::_createPipelineState(const PIPELINE_STATE_CORE_DESC& desc,
 		GpuDeviceFlags deviceMask) const
 	{
-		SPtr<GpuPipelineStateCore> pipelineState =
-			bs_shared_ptr<GpuPipelineStateCore>(new (bs_alloc<GpuPipelineStateCore>()) GpuPipelineStateCore(desc, deviceMask));
+		SPtr<GraphicsPipelineStateCore> pipelineState =
+			bs_shared_ptr<GraphicsPipelineStateCore>(new (bs_alloc<GraphicsPipelineStateCore>()) GraphicsPipelineStateCore(desc, deviceMask));
 		pipelineState->_setThisPtr(pipelineState);
 
 		return pipelineState;

Source/BansheeD3D11RenderAPI/Include/BsD3D11RenderAPI.h

@@ -25,7 +25,7 @@ namespace BansheeEngine
 		const String& getShadingLanguageName() const override;
 
 		/** @copydoc RenderAPICore::setGraphicsPipeline */
-		void setGraphicsPipeline(const SPtr<GpuPipelineStateCore>& pipelineState, 
+		void setGraphicsPipeline(const SPtr<GraphicsPipelineStateCore>& pipelineState, 
 			const SPtr<CommandBuffer>& commandBuffer = nullptr) override;
 
 		/** @copydoc RenderAPICore::setComputePipeline */

Source/BansheeD3D11RenderAPI/Source/BsD3D11RenderAPI.cpp

@@ -206,10 +206,10 @@ namespace BansheeEngine
 		RenderAPICore::destroyCore();
 	}
 
-	void D3D11RenderAPI::setGraphicsPipeline(const SPtr<GpuPipelineStateCore>& pipelineState,
+	void D3D11RenderAPI::setGraphicsPipeline(const SPtr<GraphicsPipelineStateCore>& pipelineState,
 		const SPtr<CommandBuffer>& commandBuffer)
 	{
-		auto executeRef = [&](const SPtr<GpuPipelineStateCore>& pipelineState)
+		auto executeRef = [&](const SPtr<GraphicsPipelineStateCore>& pipelineState)
 		{
 			THROW_IF_NOT_CORE_THREAD;
 

Source/BansheeGLRenderAPI/Include/BsGLRenderAPI.h

@@ -28,7 +28,7 @@ namespace BansheeEngine
 		const String& getShadingLanguageName() const override;
 
 		/** @copydoc RenderAPICore::setGraphicsPipeline */
-		void setGraphicsPipeline(const SPtr<GpuPipelineStateCore>& pipelineState,
+		void setGraphicsPipeline(const SPtr<GraphicsPipelineStateCore>& pipelineState,
 			const SPtr<CommandBuffer>& commandBuffer = nullptr) override;
 
 		/** @copydoc RenderAPICore::setComputePipeline */

Source/BansheeGLRenderAPI/Source/BsGLRenderAPI.cpp

@@ -195,10 +195,10 @@ namespace BansheeEngine
 			bs_deleteN(mTextureInfos, mNumTextureUnits);
 	}
 
-	void GLRenderAPI::setGraphicsPipeline(const SPtr<GpuPipelineStateCore>& pipelineState,
+	void GLRenderAPI::setGraphicsPipeline(const SPtr<GraphicsPipelineStateCore>& pipelineState,
 		const SPtr<CommandBuffer>& commandBuffer)
 	{
-		auto executeRef = [&](const SPtr<GpuPipelineStateCore>& pipelineState)
+		auto executeRef = [&](const SPtr<GraphicsPipelineStateCore>& pipelineState)
 		{
 			THROW_IF_NOT_CORE_THREAD;
 

Source/BansheeVulkanRenderAPI/Include/BsVulkanGpuPipelineState.h

@@ -27,17 +27,17 @@ namespace BansheeEngine
 	};
 
 	/**	Vulkan implementation of a GPU pipeline state. */
-	class VulkanGpuPipelineStateCore : public GpuPipelineStateCore
+	class VulkanGraphicsPipelineStateCore : public GraphicsPipelineStateCore
 	{
 	public:
-		~VulkanGpuPipelineStateCore();
+		~VulkanGraphicsPipelineStateCore();
 
 	protected:
 		friend class VulkanRenderStateCoreManager;
 
-		VulkanGpuPipelineStateCore(const PIPELINE_STATE_CORE_DESC& desc, GpuDeviceFlags deviceMask);
+		VulkanGraphicsPipelineStateCore(const PIPELINE_STATE_CORE_DESC& desc, GpuDeviceFlags deviceMask);
 
-		/**	@copydoc GpuPipelineStateCore::initialize */
+		/**	@copydoc GraphicsPipelineStateCore::initialize */
 		void initialize() override;
 
 		/** 

Source/BansheeVulkanRenderAPI/Include/BsVulkanRenderAPI.h

@@ -25,7 +25,7 @@ namespace BansheeEngine
 		const String& getShadingLanguageName() const override;
 
 		/** @copydoc RenderAPICore::setGraphicsPipeline */
-		void setGraphicsPipeline(const SPtr<GpuPipelineStateCore>& pipelineState, 
+		void setGraphicsPipeline(const SPtr<GraphicsPipelineStateCore>& pipelineState, 
 			const SPtr<CommandBuffer>& commandBuffer = nullptr) override;
 
 		/** @copydoc RenderAPICore::setComputePipeline */

Source/BansheeVulkanRenderAPI/Include/BsVulkanRenderStateManager.h

@@ -20,7 +20,7 @@ namespace BansheeEngine
 			GpuDeviceFlags deviceMask) const override;
 
 		/** @copydoc RenderStateCoreManager::_createPipelineState */
-		SPtr<GpuPipelineStateCore> _createPipelineState(const PIPELINE_STATE_CORE_DESC& desc,
+		SPtr<GraphicsPipelineStateCore> _createPipelineState(const PIPELINE_STATE_CORE_DESC& desc,
 			GpuDeviceFlags deviceMask = GDF_DEFAULT) const override;
 	};
 

Source/BansheeVulkanRenderAPI/Source/BsVulkanGpuPipelineState.cpp

@@ -21,18 +21,18 @@ namespace BansheeEngine
 		vkDestroyPipeline(mOwner->getDevice().getLogical(), mPipeline, gVulkanAllocator);
 	}
 
-	VulkanGpuPipelineStateCore::VulkanGpuPipelineStateCore(const PIPELINE_STATE_CORE_DESC& desc, GpuDeviceFlags deviceMask)
-		:GpuPipelineStateCore(desc, deviceMask)
+	VulkanGraphicsPipelineStateCore::VulkanGraphicsPipelineStateCore(const PIPELINE_STATE_CORE_DESC& desc, GpuDeviceFlags deviceMask)
+		:GraphicsPipelineStateCore(desc, deviceMask)
 	{
 		
 	}
 
-	VulkanGpuPipelineStateCore::~VulkanGpuPipelineStateCore()
+	VulkanGraphicsPipelineStateCore::~VulkanGraphicsPipelineStateCore()
 	{
 		BS_INC_RENDER_STAT_CAT(ResDestroyed, RenderStatObject_PipelineState);
 	}
 
-	void VulkanGpuPipelineStateCore::initialize()
+	void VulkanGraphicsPipelineStateCore::initialize()
 	{
 		std::pair<VkShaderStageFlagBits, GpuProgramCore*> stages[] =
 			{ 
@@ -206,10 +206,10 @@ namespace BansheeEngine
 		mPipelineInfo.basePipelineIndex = -1;
 
 		BS_INC_RENDER_STAT_CAT(ResCreated, RenderStatObject_PipelineState);
-		GpuPipelineStateCore::initialize();
+		GraphicsPipelineStateCore::initialize();
 	}
 
-	VkPipeline VulkanGpuPipelineStateCore::createPipeline(VkDevice device, VulkanFramebuffer* framebuffer,
+	VkPipeline VulkanGraphicsPipelineStateCore::createPipeline(VkDevice device, VulkanFramebuffer* framebuffer,
 														  bool readOnlyDepth, DrawOperationType drawOp,
 														  VkPipelineLayout pipelineLayout,
 														  VkPipelineVertexInputStateCreateInfo* vertexInputState)

Source/BansheeVulkanRenderAPI/Source/BsVulkanRenderAPI.cpp

@@ -304,7 +304,7 @@ namespace BansheeEngine
 		RenderAPICore::destroyCore();
 	}
 
-	void VulkanRenderAPI::setGraphicsPipeline(const SPtr<GpuPipelineStateCore>& pipelineState,
+	void VulkanRenderAPI::setGraphicsPipeline(const SPtr<GraphicsPipelineStateCore>& pipelineState,
 		const SPtr<CommandBuffer>& commandBuffer)
 	{
 		// TODO

Source/BansheeVulkanRenderAPI/Source/BsVulkanRenderStateManager.cpp

@@ -16,11 +16,11 @@ namespace BansheeEngine
 		return samplerState;
 	}
 
-	SPtr<GpuPipelineStateCore> VulkanRenderStateCoreManager::_createPipelineState(const PIPELINE_STATE_CORE_DESC& desc,
+	SPtr<GraphicsPipelineStateCore> VulkanRenderStateCoreManager::_createPipelineState(const PIPELINE_STATE_CORE_DESC& desc,
 		GpuDeviceFlags deviceMask) const
 	{
-		SPtr<VulkanGpuPipelineStateCore> pipelineState =
-			bs_shared_ptr<VulkanGpuPipelineStateCore>(new (bs_alloc<VulkanGpuPipelineStateCore>()) VulkanGpuPipelineStateCore(desc, deviceMask));
+		SPtr<VulkanGraphicsPipelineStateCore> pipelineState =
+			bs_shared_ptr<VulkanGraphicsPipelineStateCore>(new (bs_alloc<VulkanGraphicsPipelineStateCore>()) VulkanGraphicsPipelineStateCore(desc, deviceMask));
 		pipelineState->_setThisPtr(pipelineState);
 
 		return pipelineState;