diff options
| author | 2018-07-05 11:30:01 -0400 | |
|---|---|---|
| committer | 2018-07-05 11:30:01 -0400 | |
| commit | 956b5db52e74758ebe8f971f73b0c8fcc3c8256b (patch) | |
| tree | d65cf6c9266733d6e3a38135ef9c469c57667ca6 | |
| parent | Merge pull request #622 from Subv/unused_tex (diff) | |
| parent | GPU: Implement the Size_16_16 and Size_10_10_10_2 vertex attribute types. (diff) | |
| download | yuzu-956b5db52e74758ebe8f971f73b0c8fcc3c8256b.tar.gz yuzu-956b5db52e74758ebe8f971f73b0c8fcc3c8256b.tar.xz yuzu-956b5db52e74758ebe8f971f73b0c8fcc3c8256b.zip | |
Merge pull request #623 from Subv/vertex_types
GPU: Implement the Size_16_16 and Size_10_10_10_2 vertex attribute types
| -rw-r--r-- | src/video_core/renderer_opengl/maxwell_to_gl.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/video_core/renderer_opengl/maxwell_to_gl.h b/src/video_core/renderer_opengl/maxwell_to_gl.h index 6b9bb3df1..6ce53bbd9 100644 --- a/src/video_core/renderer_opengl/maxwell_to_gl.h +++ b/src/video_core/renderer_opengl/maxwell_to_gl.h | |||
| @@ -29,6 +29,10 @@ inline GLenum VertexType(Maxwell::VertexAttribute attrib) { | |||
| 29 | switch (attrib.size) { | 29 | switch (attrib.size) { |
| 30 | case Maxwell::VertexAttribute::Size::Size_8_8_8_8: | 30 | case Maxwell::VertexAttribute::Size::Size_8_8_8_8: |
| 31 | return GL_UNSIGNED_BYTE; | 31 | return GL_UNSIGNED_BYTE; |
| 32 | case Maxwell::VertexAttribute::Size::Size_16_16: | ||
| 33 | return GL_UNSIGNED_SHORT; | ||
| 34 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: | ||
| 35 | return GL_UNSIGNED_INT_2_10_10_10_REV; | ||
| 32 | } | 36 | } |
| 33 | 37 | ||
| 34 | LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex size={}", attrib.SizeString()); | 38 | LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex size={}", attrib.SizeString()); |
| @@ -41,6 +45,10 @@ inline GLenum VertexType(Maxwell::VertexAttribute attrib) { | |||
| 41 | switch (attrib.size) { | 45 | switch (attrib.size) { |
| 42 | case Maxwell::VertexAttribute::Size::Size_8_8_8_8: | 46 | case Maxwell::VertexAttribute::Size::Size_8_8_8_8: |
| 43 | return GL_BYTE; | 47 | return GL_BYTE; |
| 48 | case Maxwell::VertexAttribute::Size::Size_16_16: | ||
| 49 | return GL_SHORT; | ||
| 50 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: | ||
| 51 | return GL_INT_2_10_10_10_REV; | ||
| 44 | } | 52 | } |
| 45 | 53 | ||
| 46 | LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex size={}", attrib.SizeString()); | 54 | LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex size={}", attrib.SizeString()); |