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

Diff revisions: vs.
  @@ -44,11 +44,9 @@
44 44 : _lodIndex(0),
45 45 _drawCount(1),
46 46 _drawToBuffer(0),
47 - _stateHash(0),
48 47 _type(type),
49 48 _commandOffset(0),
50 49 _patchVertexCount(4),
51 - _shaderProgram(nullptr),
52 50 _sourceBuffer(nullptr),
53 51 _renderOptions(to_base(RenderOptions::RENDER_GEOMETRY))
54 52 {
  @@ -57,7 +55,8 @@
57 55 _cmd.primCount = primCount;
58 56
59 57 static_assert(sizeof(IndirectDrawCommand) == 20, "Size of IndirectDrawCommand is incorrect!");
60 - static_assert(sizeof(GenericDrawCommand) == 72, "Size of GenericDrawCommand is incorrect!");
58 + static_assert(sizeof(Pipeline) == 40, "Size of Pipeline is incorrect!");
59 + static_assert(sizeof(GenericDrawCommand) == 96, "Size of GenericDrawCommand is incorrect!");
61 60 }
62 61
63 62 void GenericDrawCommand::set(const GenericDrawCommand& base) {
  @@ -66,9 +65,8 @@
66 65 _drawCount = base._drawCount;
67 66 _drawToBuffer = base._drawToBuffer;
68 67 _renderOptions = base._renderOptions;
69 - _stateHash = base._stateHash;
70 68 _type = base._type;
71 - _shaderProgram = base._shaderProgram;
69 + _pipeline = base._pipeline;
72 70 _sourceBuffer = base._sourceBuffer;
73 71 _commandOffset = base._commandOffset;
74 72 }
  @@ -81,8 +79,8 @@
81 79 return _lodIndex == other._lodIndex &&
82 80 _drawToBuffer == other._drawToBuffer &&
83 81 _renderOptions == other._renderOptions &&
84 - _stateHash == other._stateHash && _type == other._type &&
85 - (_shaderProgram != nullptr) == (other._shaderProgram != nullptr) &&
82 + _type == other._type &&
83 + _pipeline == other._pipeline &&
86 84 (_sourceBuffer != nullptr) == (other._sourceBuffer != nullptr);
87 85 }
88 86