Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 268 vs 270 for /trunk/Source Code/Hardware/Video/OpenGL/Buffers/VertexBuffer/Headers/glVertexArray.h

Diff revisions: vs.
  @@ -63,26 +63,16 @@
63 63 /// Internally create the VB
64 64 bool CreateInternal();
65 65 /// Enable full VAO based VB (all pointers are tracked by VAO's)
66 - void Upload_VB_Attributes();
67 - void Upload_VB_Depth_Attributes();
66 + void Upload_VB_Attributes(bool depthPass = false);
68 67 /// Integrity checks
69 68 void checkStatus();
70 69
71 70 protected:
72 - typedef struct {
73 - GLuint count;
74 - GLuint instanceCount;
75 - GLuint first;
76 - GLuint baseInstance;
77 - } DrawArraysIndirectCommand;
78 -
79 71 GLenum _formatInternal;
80 72 GLenum _typeInternal;
81 73 GLuint _IBid;
82 74 GLuint _VBid;
83 - GLuint _DepthVBid;
84 - GLuint _VAOid;
85 - GLuint _DepthVAOid;
75 + GLuint _VAOid[2];
86 76 GLuint _usage;
87 77 bool _animationData; ///< Used to bind an extra set of vertex attributes for bone indices and bone weights
88 78 bool _refreshQueued; ///< A refresh call might be called before "Create()". This should help with that
  @@ -90,14 +80,7 @@
90 80 vectorImpl<vec4<GLshort> > _tangentSmall;
91 81 vectorImpl<vec4<GLshort> > _bitangentSmall;
92 82
93 - GLsizei _prevSizePosition;
94 - GLsizei _prevSizeColor;
95 - GLsizei _prevSizeNormal;
96 - GLsizei _prevSizeTexcoord;
97 - GLsizei _prevSizeTangent;
98 - GLsizei _prevSizeBiTangent;
99 - GLsizei _prevSizeBoneWeights;
100 - GLsizei _prevSizeBoneIndices;
83 + GLsizei _prevSize[VertexAttribute_PLACEHOLDER];
101 84 GLsizei _prevSizeIndices;
102 85
103 86 const static U32 MAX_DRAW_COMMANDS = 128 * 8;