From b5dfdbdd55951a61953895a7d846b408fe27b1fc Mon Sep 17 00:00:00 2001
From: kaetemi <devnull@localhost>
Date: Wed, 19 Jun 2013 01:19:45 +0200
Subject: [PATCH] Simplify CPixelProgram

---
 code/nel/include/nel/3d/pixel_program.h | 16 ++++------------
 code/nel/src/3d/pixel_program.cpp       |  9 +++++----
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/code/nel/include/nel/3d/pixel_program.h b/code/nel/include/nel/3d/pixel_program.h
index 35731ca6d..fd39a76bc 100644
--- a/code/nel/include/nel/3d/pixel_program.h
+++ b/code/nel/include/nel/3d/pixel_program.h
@@ -26,15 +26,11 @@
 #ifndef 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>
 
-#define PIXEL_SHADER_PROFILE "ps_2_0"
-
 namespace NL3D {
 
 // List typedef.
@@ -59,22 +55,18 @@ public:
 
 
 //-------------------------------------------------------------------------------
-class CPixelProgram : public IProgram
+class CPixelProgram : public NLMISC::CRefCount
 {
 public:
 
 	/// Constructor
-	CPixelProgram (const char* program, bool isEffectPrg=false);
+	CPixelProgram (const char* program);
 
 	/// Destructor
 	virtual ~CPixelProgram ();
 
 	/// The driver informations. For the driver implementation only.
 	NLMISC::CRefPtr<IPixelProgramDrvInfos>		_DrvInfo;
-
-	const char * getASMProfile() { return PIXEL_SHADER_PROFILE; } ;
-
-	static const char * getPixelASMProfile() { return PIXEL_SHADER_PROFILE; } ;
 };
 
 
diff --git a/code/nel/src/3d/pixel_program.cpp b/code/nel/src/3d/pixel_program.cpp
index bd0e4d709..b7cba51d0 100644
--- a/code/nel/src/3d/pixel_program.cpp
+++ b/code/nel/src/3d/pixel_program.cpp
@@ -25,9 +25,9 @@
 
 #include "std3d.h"
 
-#include "pixel_program.h"
+#include <nel/3d/pixel_program.h>
 
-#include "driver.h"
+#include <nel/3d/driver.h>
 
 namespace NL3D 
 {
@@ -48,15 +48,16 @@ IPixelProgramDrvInfos::~IPixelProgramDrvInfos ()
 
 
 // ***************************************************************************
-CPixelProgram::CPixelProgram(const char* program, bool isEffectPrg)
-:IProgram(program, isEffectPrg)
+CPixelProgram::CPixelProgram(const char* program)
 {
+
 }
 
 
 // ***************************************************************************
 CPixelProgram::~CPixelProgram()
 {
+
 }
 
 } // NL3D