Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 726 vs 727 for /trunk/Source Code/Platform/Video/Headers/GFXDevice.h

Diff revisions: vs.
  @@ -89,6 +89,7 @@
89 89 typedef hashMapImpl<size_t, RenderStateBlock> RenderStateMap;
90 90 typedef std::stack<vec4<I32>> ViewportStack;
91 91
92 + public:
92 93 struct NodeData {
93 94 mat4<F32> _worldMatrix;
94 95 mat4<F32> _normalMatrixWV;
  @@ -391,7 +392,7 @@
391 392 inline const PlaneList& getClippingPlanes() const { return _clippingPlanes; }
392 393
393 394 /// Return the last number of HIZ culled items
394 - U32 getLastCullCount(U32 pass = 0) const;
395 + U32 getLastCullCount() const;
395 396
396 397 /// 2D rendering enabled
397 398 inline bool is2DRendering() const { return _2DRendering; }
  @@ -468,13 +469,12 @@
468 469 return _api->newShaderProgram(*this, name, resourceLocation, asyncLoad);
469 470 }
470 471
471 - inline ShaderBuffer* newSB(const stringImpl& bufferName,
472 - const U32 ringBufferLength = 1,
472 + inline ShaderBuffer* newSB(const U32 ringBufferLength = 1,
473 473 const bool unbound = false,
474 474 const bool persistentMapped = true,
475 475 BufferUpdateFrequency frequency =
476 476 BufferUpdateFrequency::ONCE) {
477 - return _api->newSB(*this, bufferName, ringBufferLength, unbound, persistentMapped, frequency);
477 + return _api->newSB(*this, ringBufferLength, unbound, persistentMapped, frequency);
478 478 }
479 479
480 480 inline U64 getFrameDurationGPU() {
  @@ -521,11 +521,11 @@
521 521 protected:
522 522 friend class SceneManager;
523 523 friend class RenderPass;
524 - void occlusionCull(U32 pass);
524 + void occlusionCull(const RenderPass::BufferData& bufferData);
525 525 void buildDrawCommands(RenderPassCuller::VisibleNodeList& visibleNodes,
526 526 SceneRenderState& sceneRenderState,
527 - bool refreshNodeData,
528 - U32 pass);
527 + RenderPass::BufferData& bufferData,
528 + bool refreshNodeData);
529 529 bool batchCommands(GenericDrawCommand& previousIDC,
530 530 GenericDrawCommand& currentIDC) const;
531 531 void constructHIZ();
  @@ -554,12 +554,6 @@
554 554
555 555 NodeData& processVisibleNode(const SceneGraphNode& node, U32 dataIndex);
556 556
557 - ShaderBuffer& getCommandBuffer(RenderStage stage, U32 pass) const;
558 -
559 - U32 getNodeBufferIndexForStage(RenderStage stage) const;
560 -
561 - ShaderBuffer& getNodeBuffer(RenderStage stage, U32 pass) const;
562 -
563 557 RenderTarget& activeRenderTarget();
564 558 const RenderTarget& activeRenderTarget() const;
565 559
  @@ -644,10 +638,6 @@
644 638 vectorImpl<RenderQueue> _renderQueues;
645 639
646 640 ShaderBuffer* _gfxDataBuffer;
647 - typedef std::array<ShaderBuffer*, MAX_PASSES_PER_STAGE> RenderStageBuffer;
648 - // Z_PRE_PASS and display SHOULD SHARE THE SAME BUFFERS
649 - std::array<RenderStageBuffer, to_const_uint(RenderStage::COUNT) - 1> _indirectCommandBuffers;
650 - std::array<RenderStageBuffer, to_const_uint(RenderStage::COUNT) - 1> _nodeBuffers;
651 641 GenericDrawCommand _defaultDrawCmd;
652 642
653 643 GenericCommandPool _commandPool;