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/ShaderProgram.cpp

Diff revisions: vs.
  @@ -32,7 +32,6 @@
32 32 _maxCombinedTextureUnits = ParamHandler::getInstance().getParam<I32>("GFX_DEVICE.maxTextureCombinedUnits",16);
33 33
34 34 _extendedMatricesDirty = true;
35 - _clipPlanesDirty = true;
36 35 _sceneDataDirty = true;
37 36 _extendedMatrixEntry[WORLD_MATRIX] = -1;
38 37 _extendedMatrixEntry[WV_MATRIX] = -1;
  @@ -42,8 +41,6 @@
42 41 _invProjMatrixEntry = -1;
43 42 _timeLoc = -1;
44 43 _cameraLocationLoc = -1;
45 - _clipPlanesLoc = -1;
46 - _clipPlaneCountLoc = -1;
47 44 _enableFogLoc = -1;
48 45 _lightAmbientLoc = -1;
49 46 _zPlanesLoc = -1;
  @@ -151,8 +148,6 @@
151 148 _invProjMatrixEntry = this->cachedLoc("dvd_ProjectionMatrixInverse");
152 149 _timeLoc = this->cachedLoc("dvd_time");
153 150 _cameraLocationLoc = this->cachedLoc("dvd_cameraPosition");
154 - _clipPlanesLoc = this->cachedLoc("dvd_clip_plane");
155 - _clipPlaneCountLoc = this->cachedLoc("dvd_clip_plane_count");
156 151 _enableFogLoc = this->cachedLoc("dvd_enableFog");
157 152 _lightAmbientLoc = this->cachedLoc("dvd_lightAmbient");
158 153 _zPlanesLoc = this->cachedLoc("dvd_zPlanes");
  @@ -221,23 +216,6 @@
221 216 }
222 217 _extendedMatricesDirty = false;
223 218 }
224 -
225 - /*Get and upload clip plane data*/
226 - //GFX_DEVICE.updateClipPlanes();
227 -
228 - if (_clipPlanesDirty == true){
229 - _clipPlanesDirty = false;
230 - _clipPlanes.resize(0);
231 -
232 - for (const Plane<F32>& currentPlane : GFX.getClippingPlanes())
233 - _clipPlanes.push_back(currentPlane.getEquation());
234 -
235 - this->Uniform(_clipPlaneCountLoc, (I32)_clipPlanes.size());
236 -
237 - if (_clipPlanes.empty()) return;
238 -
239 - this->Uniform(_clipPlanesLoc, _clipPlanes);
240 - }
241 219 }
242 220
243 221 void ShaderProgram::SetLOD(U8 currentLOD){