Commit 9b6bbb04 authored by hybrid's avatar hybrid

Unify gpu programming service calls.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2920 dfc29bdd-3216-0410-991c-e03cc46cb475
parent ce6a3528
...@@ -2144,13 +2144,6 @@ bool CD3D8Driver::setPixelShaderConstant(const c8* name, const f32* floats, int ...@@ -2144,13 +2144,6 @@ bool CD3D8Driver::setPixelShaderConstant(const c8* name, const f32* floats, int
} }
//! Returns pointer to the IGPUProgrammingServices interface.
IGPUProgrammingServices* CD3D8Driver::getGPUProgrammingServices()
{
return this;
}
//! Adds a new material renderer to the VideoDriver, using pixel and/or //! Adds a new material renderer to the VideoDriver, using pixel and/or
//! vertex shaders to render geometry. //! vertex shaders to render geometry.
s32 CD3D8Driver::addShaderMaterial(const c8* vertexShaderProgram, s32 CD3D8Driver::addShaderMaterial(const c8* vertexShaderProgram,
......
...@@ -187,9 +187,6 @@ namespace video ...@@ -187,9 +187,6 @@ namespace video
//! Sets a constant for the pixel shader based on a name. //! Sets a constant for the pixel shader based on a name.
virtual bool setPixelShaderConstant(const c8* name, const f32* floats, int count); virtual bool setPixelShaderConstant(const c8* name, const f32* floats, int count);
//! Returns pointer to the IGPUProgrammingServices interface.
virtual IGPUProgrammingServices* getGPUProgrammingServices();
//! Returns a pointer to the IVideoDriver interface. (Implementation for //! Returns a pointer to the IVideoDriver interface. (Implementation for
//! IMaterialRendererServices) //! IMaterialRendererServices)
virtual IVideoDriver* getVideoDriver(); virtual IVideoDriver* getVideoDriver();
......
...@@ -2884,13 +2884,6 @@ bool CD3D9Driver::setPixelShaderConstant(const c8* name, const f32* floats, int ...@@ -2884,13 +2884,6 @@ bool CD3D9Driver::setPixelShaderConstant(const c8* name, const f32* floats, int
} }
//! Returns pointer to the IGPUProgrammingServices interface.
IGPUProgrammingServices* CD3D9Driver::getGPUProgrammingServices()
{
return this;
}
//! Adds a new material renderer to the VideoDriver, using pixel and/or //! Adds a new material renderer to the VideoDriver, using pixel and/or
//! vertex shaders to render geometry. //! vertex shaders to render geometry.
s32 CD3D9Driver::addShaderMaterial(const c8* vertexShaderProgram, s32 CD3D9Driver::addShaderMaterial(const c8* vertexShaderProgram,
......
...@@ -241,9 +241,6 @@ namespace video ...@@ -241,9 +241,6 @@ namespace video
//! Sets a constant for the pixel shader based on a name. //! Sets a constant for the pixel shader based on a name.
virtual bool setPixelShaderConstant(const c8* name, const f32* floats, int count); virtual bool setPixelShaderConstant(const c8* name, const f32* floats, int count);
//! Returns pointer to the IGPUProgrammingServices interface.
virtual IGPUProgrammingServices* getGPUProgrammingServices();
//! Returns a pointer to the IVideoDriver interface. (Implementation for //! Returns a pointer to the IVideoDriver interface. (Implementation for
//! IMaterialRendererServices) //! IMaterialRendererServices)
virtual IVideoDriver* getVideoDriver(); virtual IVideoDriver* getVideoDriver();
......
...@@ -1781,7 +1781,7 @@ const char* CNullDriver::getMaterialRendererName(u32 idx) const ...@@ -1781,7 +1781,7 @@ const char* CNullDriver::getMaterialRendererName(u32 idx) const
//! Returns pointer to the IGPUProgrammingServices interface. //! Returns pointer to the IGPUProgrammingServices interface.
IGPUProgrammingServices* CNullDriver::getGPUProgrammingServices() IGPUProgrammingServices* CNullDriver::getGPUProgrammingServices()
{ {
return 0; return this;
} }
......
...@@ -3258,13 +3258,6 @@ IVideoDriver* COpenGLDriver::getVideoDriver() ...@@ -3258,13 +3258,6 @@ IVideoDriver* COpenGLDriver::getVideoDriver()
} }
//! Returns pointer to the IGPUProgrammingServices interface.
IGPUProgrammingServices* COpenGLDriver::getGPUProgrammingServices()
{
return this;
}
ITexture* COpenGLDriver::addRenderTargetTexture(const core::dimension2d<u32>& size, ITexture* COpenGLDriver::addRenderTargetTexture(const core::dimension2d<u32>& size,
const io::path& name, const io::path& name,
const ECOLOR_FORMAT format) const ECOLOR_FORMAT format)
......
...@@ -266,9 +266,6 @@ namespace video ...@@ -266,9 +266,6 @@ namespace video
E_PIXEL_SHADER_TYPE psCompileTarget, IShaderConstantSetCallBack* callback, E_MATERIAL_TYPE baseMaterial, E_PIXEL_SHADER_TYPE psCompileTarget, IShaderConstantSetCallBack* callback, E_MATERIAL_TYPE baseMaterial,
s32 userData); s32 userData);
//! Returns pointer to the IGPUProgrammingServices interface.
virtual IGPUProgrammingServices* getGPUProgrammingServices();
//! Returns a pointer to the IVideoDriver interface. (Implementation for //! Returns a pointer to the IVideoDriver interface. (Implementation for
//! IMaterialRendererServices) //! IMaterialRendererServices)
virtual IVideoDriver* getVideoDriver(); virtual IVideoDriver* getVideoDriver();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment