Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 279 vs 280 for /trunk/Source Code/Hardware/Video/Shaders/Headers/ShaderProgram.h

Diff revisions: vs.
  @@ -158,7 +158,6 @@
158 158 friend class ShaderManager;
159 159 vectorImpl<Shader* > getShaders(const ShaderType& type) const;
160 160 inline void setMatricesDirty() { _extendedMatricesDirty = true; }
161 - inline void updateClipPlanes() { _clipPlanesDirty = true; }
162 161 inline void setSceneDataDirty() { _sceneDataDirty = true; }
163 162 static void updateCamera(const Camera& activeCamera);
164 163 I32 operator==(const ShaderProgram &_v) { return this->getGUID() == _v.getGUID(); }
  @@ -195,8 +194,6 @@
195 194 ///ID<->shaders pair
196 195 typedef Unordered_map<U32, Shader* > ShaderIdMap;
197 196 ShaderIdMap _shaderIdMap;
198 - ///cached clipping planes
199 - vectorImpl<vec4<F32> > _clipPlanes;
200 197 ///Active camera's cached eye position
201 198 static vec3<F32> _cachedCamEye;
202 199 ///Active camera's cached zPlanes
  @@ -205,17 +202,15 @@
205 202 static vec2<F32> _cachedSceneZPlanes;
206 203 vectorImpl<U32> _lodVertLight;
207 204 vectorImpl<U32> _lodFragLight;
205 +
208 206 private:
209 207 Camera* _activeCamera;
210 208 Unordered_map<EXTENDED_MATRIX, I32 > _extendedMatrixEntry;
211 209 bool _extendedMatricesDirty;
212 - bool _clipPlanesDirty;
213 210 bool _sceneDataDirty;
214 211 ///Various uniform/attribute locations
215 212 I32 _timeLoc;
216 213 I32 _cameraLocationLoc;
217 - I32 _clipPlanesLoc;
218 - I32 _clipPlaneCountLoc;
219 214 I32 _enableFogLoc;
220 215 I32 _lightAmbientLoc;
221 216 I32 _zPlanesLoc;