summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/maxwell_to_gl.h16
-rw-r--r--src/yuzu/main.ui8
2 files changed, 21 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/maxwell_to_gl.h b/src/video_core/renderer_opengl/maxwell_to_gl.h
index 3c3bcaae4..0f6dcab2b 100644
--- a/src/video_core/renderer_opengl/maxwell_to_gl.h
+++ b/src/video_core/renderer_opengl/maxwell_to_gl.h
@@ -82,8 +82,20 @@ inline GLenum VertexType(Maxwell::VertexAttribute attrib) {
82 return {}; 82 return {};
83 } 83 }
84 84
85 case Maxwell::VertexAttribute::Type::Float: 85 case Maxwell::VertexAttribute::Type::Float: {
86 return GL_FLOAT; 86 switch (attrib.size) {
87 case Maxwell::VertexAttribute::Size::Size_16:
88 case Maxwell::VertexAttribute::Size::Size_16_16:
89 case Maxwell::VertexAttribute::Size::Size_16_16_16:
90 case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
91 return GL_HALF_FLOAT;
92 case Maxwell::VertexAttribute::Size::Size_32:
93 case Maxwell::VertexAttribute::Size::Size_32_32:
94 case Maxwell::VertexAttribute::Size::Size_32_32_32:
95 case Maxwell::VertexAttribute::Size::Size_32_32_32_32:
96 return GL_FLOAT;
97 }
98 }
87 } 99 }
88 100
89 LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex type={}", attrib.TypeString()); 101 LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex type={}", attrib.TypeString());
diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui
index 9851f507d..dffd9c788 100644
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@@ -97,18 +97,24 @@
97 <addaction name="action_Show_Status_Bar"/> 97 <addaction name="action_Show_Status_Bar"/>
98 <addaction name="menu_View_Debugging"/> 98 <addaction name="menu_View_Debugging"/>
99 </widget> 99 </widget>
100 <widget class ="QMenu" name="menu_Tools">
101 <property name="title">
102 <string>Tools</string>
103 </property>
104 <addaction name="action_Rederive" />
105 </widget>
100 <widget class="QMenu" name="menu_Help"> 106 <widget class="QMenu" name="menu_Help">
101 <property name="title"> 107 <property name="title">
102 <string>&amp;Help</string> 108 <string>&amp;Help</string>
103 </property> 109 </property>
104 <addaction name="action_Report_Compatibility"/> 110 <addaction name="action_Report_Compatibility"/>
105 <addaction name="separator"/> 111 <addaction name="separator"/>
106 <addaction name="action_Rederive"/>
107 <addaction name="action_About"/> 112 <addaction name="action_About"/>
108 </widget> 113 </widget>
109 <addaction name="menu_File"/> 114 <addaction name="menu_File"/>
110 <addaction name="menu_Emulation"/> 115 <addaction name="menu_Emulation"/>
111 <addaction name="menu_View"/> 116 <addaction name="menu_View"/>
117 <addaction name="menu_Tools" />
112 <addaction name="menu_Help"/> 118 <addaction name="menu_Help"/>
113 </widget> 119 </widget>
114 <action name="action_Install_File_NAND"> 120 <action name="action_Install_File_NAND">