luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6426 through r6466 from trunk to ogl-es branch

Browse Source 
Note: Updated IShaderConstantSetCallBack not yet supported by ogl-es drivers


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6467 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2023-04-22 21:50:32 +00:00
parent e184e4aedb
commit 621bad3111
118 changed files with 12767 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/Irrlicht/CD3D9ShaderMaterialRenderer.h
View File

@@ -21,7 +21,7 @@ namespace irr
namespace video
{
class IVideoDriver;
class CD3D9Driver;
class IShaderConstantSetCallBack;
class IMaterialRenderer;
@@ -31,7 +31,7 @@ class CD3D9ShaderMaterialRenderer : public IMaterialRenderer
public:
//! Public constructor
CD3D9ShaderMaterialRenderer(IDirect3DDevice9* d3ddev, video::IVideoDriver* driver,
CD3D9ShaderMaterialRenderer(IDirect3DDevice9* d3ddev, video::CD3D9Driver* driver,
s32& outMaterialTypeNr, const c8* vertexShaderProgram, const c8* pixelShaderProgram,
IShaderConstantSetCallBack* callback, IMaterialRenderer* baseMaterial, s32 userData);
@@ -59,7 +59,7 @@ protected:
//! constructor only for use by derived classes who want to
//! create a fall back material for example.
CD3D9ShaderMaterialRenderer(IDirect3DDevice9* d3ddev,
video::IVideoDriver* driver,
video::CD3D9Driver* driver,
IShaderConstantSetCallBack* callback,
IMaterialRenderer* baseMaterial,
s32 userData=0);
@@ -88,7 +88,7 @@ protected:
LPD3DXCONSTANTTABLE* ppConstantTable);
IDirect3DDevice9* pID3DDevice;
video::IVideoDriver* Driver;
video::CD3D9Driver* Driver;
IShaderConstantSetCallBack* CallBack;
IMaterialRenderer* BaseMaterial;