Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 892 vs 893 for /trunk/Source Code/Platform/Video/GFXDeviceState.cpp

Diff revisions: vs.
  @@ -87,14 +87,14 @@
87 87 EnvironmentProbe::onStartup(*this);
88 88 PostFX::createInstance();
89 89 // Create a shader buffer to store the GFX rendering info (matrices, options, etc)
90 - ShaderBufferParams params;
91 - params._primitiveCount = 1;
92 - params._primitiveSizeInBytes = sizeof(GFXShaderData::GPUData);
93 - params._ringBufferLength = 1;
94 - params._unbound = false;
95 - params._updateFrequency = BufferUpdateFrequency::OFTEN;
96 - params._initialData = &_gpuBlock._data;
97 - _gfxDataBuffer = newSB(params);
90 + ShaderBufferDescriptor bufferDescriptor;
91 + bufferDescriptor._primitiveCount = 1;
92 + bufferDescriptor._primitiveSizeInBytes = sizeof(GFXShaderData::GPUData);
93 + bufferDescriptor._ringBufferLength = 1;
94 + bufferDescriptor._unbound = false;
95 + bufferDescriptor._updateFrequency = BufferUpdateFrequency::OFTEN;
96 + bufferDescriptor._initialData = &_gpuBlock._data;
97 + _gfxDataBuffer = newSB(bufferDescriptor);
98 98
99 99 _shaderComputeQueue = MemoryManager_NEW ShaderComputeQueue(cache);
100 100
  @@ -272,14 +272,19 @@
272 272 postFX.pushFilter(FilterType::FILTER_LUT_CORECTION);
273 273 }
274 274
275 +
276 + PipelineDescriptor pipelineDesc;
277 +
275 278 _axisGizmo = newIMP();
276 279 _axisGizmo->name("GFXDeviceAxisGizmo");
277 280 RenderStateBlock primitiveDescriptor(RenderStateBlock::get(getDefaultStateBlock(true)));
278 - _axisGizmo->stateHash(primitiveDescriptor.getHash());
281 + pipelineDesc._stateHash = primitiveDescriptor.getHash();
282 + Pipeline primitivePipeline = newPipeline(pipelineDesc);
283 + _axisGizmo->pipeline(primitivePipeline);
279 284
280 285 _debugFrustumPrimitive = newIMP();
281 286 _debugFrustumPrimitive->name("DebugFrustum");
282 - _debugFrustumPrimitive->stateHash(primitiveDescriptor.getHash());
287 + _debugFrustumPrimitive->pipeline(primitivePipeline);
283 288
284 289 ResourceDescriptor previewNormalsShader("fbPreview");
285 290 previewNormalsShader.setThreadedLoading(false);