Merge pull request #993 from bunnei/smo-vtx-pts
Implement VertexAttribute::Size::Size_16_16_16_16 and PrimitiveTopology::Points.
This commit is contained in:
commit
b125137493
|
@ -31,6 +31,7 @@ inline GLenum VertexType(Maxwell::VertexAttribute attrib) {
|
||||||
case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
|
case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
|
||||||
return GL_UNSIGNED_BYTE;
|
return GL_UNSIGNED_BYTE;
|
||||||
case Maxwell::VertexAttribute::Size::Size_16_16:
|
case Maxwell::VertexAttribute::Size::Size_16_16:
|
||||||
|
case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
|
||||||
return GL_UNSIGNED_SHORT;
|
return GL_UNSIGNED_SHORT;
|
||||||
case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
|
case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
|
||||||
return GL_UNSIGNED_INT_2_10_10_10_REV;
|
return GL_UNSIGNED_INT_2_10_10_10_REV;
|
||||||
|
@ -85,6 +86,8 @@ inline GLenum IndexFormat(Maxwell::IndexFormat index_format) {
|
||||||
|
|
||||||
inline GLenum PrimitiveTopology(Maxwell::PrimitiveTopology topology) {
|
inline GLenum PrimitiveTopology(Maxwell::PrimitiveTopology topology) {
|
||||||
switch (topology) {
|
switch (topology) {
|
||||||
|
case Maxwell::PrimitiveTopology::Points:
|
||||||
|
return GL_POINTS;
|
||||||
case Maxwell::PrimitiveTopology::Triangles:
|
case Maxwell::PrimitiveTopology::Triangles:
|
||||||
return GL_TRIANGLES;
|
return GL_TRIANGLES;
|
||||||
case Maxwell::PrimitiveTopology::TriangleStrip:
|
case Maxwell::PrimitiveTopology::TriangleStrip:
|
||||||
|
|
Reference in New Issue