- Removed Zink from renderer list
 - Added virgl binaries for all architectures except 32-bit x86
 - Updated all Mesa binaries to latest
This commit is contained in:
artdeell
2021-11-15 19:24:49 +03:00
parent cd80841236
commit 3e5f04a2d2
12 changed files with 14 additions and 5 deletions

View File

@@ -1 +1 @@
20211114
20211115

View File

@@ -787,6 +787,10 @@ int pojavInit() {
if (strncmp("opengles3_virgl", renderer, 15) == 0) {
config_renderer = RENDERER_VIRGL;
setenv("GALLIUM_DRIVER","virpipe",1);
setenv("OSMESA_NO_FLUSH_FRONTBUFFER","1",false);
if(strcmp(getenv("OSMESA_NO_FLUSH_FRONTBUFFER"),"1") == 0) {
printf("VirGL: OSMesa buffer flush is DISABLED!\n");
}
loadSymbolsVirGL();
} else if (strncmp("opengles", renderer, 8) == 0) {
config_renderer = RENDERER_GL4ES;
@@ -929,10 +933,15 @@ void pojavSwapBuffers() {
} break;
case RENDERER_VK_ZINK: {
((struct osmesa_context)*OSMesaGetCurrentContext_p())
.current_buffer->map = buf.bits;
OSMesaContext ctx = OSMesaGetCurrentContext_p();
if(ctx == NULL) {
printf("Zink: attempted to swap buffers without context!");
break;
}
OSMesaMakeCurrent_p(ctx,buf.bits,GL_UNSIGNED_BYTE,savedWidth,savedHeight);
glFinish_p();
ANativeWindow_unlockAndPost(potatoBridge.androidWindow);
//OSMesaMakeCurrent_p(ctx,gbuffer,GL_UNSIGNED_BYTE,savedWidth,savedHeight);
ANativeWindow_lock(potatoBridge.androidWindow,&buf,NULL);
} break;
}

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

@@ -4,7 +4,7 @@
<item name="2">@string/mcl_setting_renderer_gles2_4</item>
<item name="3">@string/mcl_setting_renderer_gles2_5</item>
<item name="3">@string/mcl_setting_renderer_gles3_5</item>
<item name="4">@string/mcl_setting_renderer_vulkan_zink</item>
<!-- <item name="4">@string/mcl_setting_renderer_vulkan_zink</item> -->
<item name="5">@string/mcl_setting_renderer_vgpu</item>
<item name="5">@string/mcl_setting_renderer_virgl</item>
</string-array>
@@ -13,7 +13,7 @@
<item>opengles2</item> <!-- gl4es 1.1.4 with OpenGL ES 2 -->
<item>opengles2_5</item> <!-- gl4es 1.1.5 with OpenGL ES 2 -->
<item>opengles3</item> <!-- gl4es 1.1.5 with OpenGL ES 3 -->
<item>vulkan_zink</item>
<!--<item>vulkan_zink</item> -->
<item>opengles3_vgpu</item> <!-- vgpu with OpenGL ES 3 -->
<item>opengles3_virgl</item> <!-- virglrenderer with OpenGL ES 3 -->
</string-array>