aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-13 10:49:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify CPixelProgram

Browse source
This commit is contained in:
kaetemi 2013-06-19 01:19:45 +02:00
parent 5f4380e33b
commit 6675a7ca93
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
code/nel/include/nel/3d/pixel_program.h
View file

@ -26,15 +26,11 @@
#ifndef NL_PIXEL_PROGRAM_H #ifndef NL_PIXEL_PROGRAM_H
#define NL_PIXEL_PROGRAM_H #define NL_PIXEL_PROGRAM_H
#include "program.h" #include <nel/misc/types_nl.h>
#include <nel/misc/smart_ptr.h>
#include "nel/misc/types_nl.h"
#include "nel/misc/smart_ptr.h"
#include <list> #include <list>
#define PIXEL_SHADER_PROFILE "ps_2_0"
namespace NL3D { namespace NL3D {
// List typedef. // List typedef.
@ -59,22 +55,18 @@ public:
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
class CPixelProgram : public IProgram class CPixelProgram : public NLMISC::CRefCount
{ {
public: public:
/// Constructor /// Constructor
CPixelProgram (const char* program, bool isEffectPrg=false); CPixelProgram (const char* program);
/// Destructor /// Destructor
virtual ~CPixelProgram (); virtual ~CPixelProgram ();
/// The driver informations. For the driver implementation only. /// The driver informations. For the driver implementation only.
NLMISC::CRefPtr<IPixelProgramDrvInfos> _DrvInfo; NLMISC::CRefPtr<IPixelProgramDrvInfos> _DrvInfo;
const char * getASMProfile() { return PIXEL_SHADER_PROFILE; } ;
static const char * getPixelASMProfile() { return PIXEL_SHADER_PROFILE; } ;
}; };

9
code/nel/src/3d/pixel_program.cpp
View file

@ -25,9 +25,9 @@
#include "std3d.h" #include "std3d.h"
#include "pixel_program.h" #include <nel/3d/pixel_program.h>
#include "driver.h" #include <nel/3d/driver.h>
namespace NL3D namespace NL3D
{ {
@ -48,15 +48,16 @@ IPixelProgramDrvInfos::~IPixelProgramDrvInfos ()
// *************************************************************************** // ***************************************************************************
CPixelProgram::CPixelProgram(const char* program, bool isEffectPrg) CPixelProgram::CPixelProgram(const char* program)
:IProgram(program, isEffectPrg)
{ {
} }
// *************************************************************************** // ***************************************************************************
CPixelProgram::~CPixelProgram() CPixelProgram::~CPixelProgram()
{ {
} }
} // NL3D } // NL3D