Dima353/librw-vita
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for latest vitaGL

Browse Source
This commit is contained in:
Dima353
2026-07-23 03:21:06 +03:00
parent 5e14b3f812
commit 7d73222f14
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -11,7 +11,7 @@ CC = $(PREFIX)-gcc
CXX = $(PREFIX)-g++ CXX = $(PREFIX)-g++
AR = $(PREFIX)-gcc-ar AR = $(PREFIX)-gcc-ar
CFLAGS = -g -Wl,-q,--no-enum-size-warning -fno-short-enums -fno-optimize-sibling-calls -O3 -fsingle-precision-constant -mfloat-abi=hard -ffast-math \ CFLAGS = -g -Wl,-q,--no-enum-size-warning -fno-short-enums -fno-optimize-sibling-calls -O3 -fsingle-precision-constant -mfloat-abi=hard -ffast-math \
-DPSP2 -DNDEBUG -DRW_GL3 -DLIBRW_GLAD -Dmemcpy_neon=sceClibMemcpy -DPSP2 -DNDEBUG -DRW_GL3 -DLIBRW_GLAD -DPSP2_USE_SHADER_COMPILER -Dmemcpy_neon=sceClibMemcpy
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)
ASFLAGS = $(CFLAGS) ASFLAGS = $(CFLAGS)
src/gl/gl3device.cpp
-3
View File
@@ -1536,11 +1536,8 @@ openGLFW(EngineOpenParams *openparams)
} }
#ifdef PSP2_USE_SHADER_COMPILER #ifdef PSP2_USE_SHADER_COMPILER
vglSetupRuntimeShaderCompiler(SHARK_OPT_UNSAFE, SHARK_ENABLE, SHARK_ENABLE, SHARK_ENABLE); vglSetupRuntimeShaderCompiler(SHARK_OPT_UNSAFE, SHARK_ENABLE, SHARK_ENABLE, SHARK_ENABLE);
#else
vglEnableRuntimeShaderCompiler(GL_FALSE);
#endif #endif
vglInitExtended(0, 960, 544, 0x800000, SCE_GXM_MULTISAMPLE_4X); vglInitExtended(0, 960, 544, 0x800000, SCE_GXM_MULTISAMPLE_4X);
vglUseVram(GL_TRUE);
makeVideoModeList(); makeVideoModeList();
return 1; return 1;
src/gl/gl3immed.cpp
+4 -4
View File
@@ -129,7 +129,7 @@ im2DRenderPrimitive(PrimitiveType primType, void *vertices, int32 numVertices)
vglIndexPointerMapped(gConstIndices); vglIndexPointerMapped(gConstIndices);
gVertexBufferIm2D += numVertices*(sizeof(Im2DVertex)/sizeof(float)); gVertexBufferIm2D += numVertices*(sizeof(Im2DVertex)/sizeof(float));
vglDrawObjects(primTypeMap[primType], numVertices, GL_FALSE); vglDrawObjects(primTypeMap[primType], numVertices);
} }
@@ -163,7 +163,7 @@ im2DRenderIndexedPrimitive(PrimitiveType primType,
vglVertexAttribPointerMapped(0, gVertexBufferIm2D); vglVertexAttribPointerMapped(0, gVertexBufferIm2D);
gVertexBufferIm2D += numVertices*(sizeof(Im2DVertex)/sizeof(float)); gVertexBufferIm2D += numVertices*(sizeof(Im2DVertex)/sizeof(float));
vglDrawObjects(primTypeMap[primType], numIndices, GL_FALSE); vglDrawObjects(primTypeMap[primType], numIndices);
} }
@@ -243,7 +243,7 @@ im3DRenderPrimitive(PrimitiveType primType)
vglIndexPointerMapped(gConstIndices); vglIndexPointerMapped(gConstIndices);
vglVertexAttribPointerMapped(0, gVertexBufferIm3D); vglVertexAttribPointerMapped(0, gVertexBufferIm3D);
gVertexBufferIm3D += num3DVertices*(sizeof(Im3DVertex)/sizeof(float)); gVertexBufferIm3D += num3DVertices*(sizeof(Im3DVertex)/sizeof(float));
vglDrawObjects(primTypeMap[primType], num3DVertices, GL_FALSE); vglDrawObjects(primTypeMap[primType], num3DVertices);
} }
void void
@@ -255,7 +255,7 @@ im3DRenderIndexedPrimitive(PrimitiveType primType, void *indices, int32 numIndic
vglVertexAttribPointerMapped(0, gVertexBufferIm3D); vglVertexAttribPointerMapped(0, gVertexBufferIm3D);
gVertexBufferIm3D += num3DVertices*(sizeof(Im3DVertex)/sizeof(float)); gVertexBufferIm3D += num3DVertices*(sizeof(Im3DVertex)/sizeof(float));
gIndicesIm3D += numIndices; gIndicesIm3D += numIndices;
vglDrawObjects(primTypeMap[primType], numIndices, GL_FALSE); vglDrawObjects(primTypeMap[primType], numIndices);
} }
void void
src/gl/gl3render.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ drawInst_simple(InstanceDataHeader *header, InstanceData *inst)
{ {
vglIndexPointerMapped((uint8_t*)header->indexBuffer + inst->offset); vglIndexPointerMapped((uint8_t*)header->indexBuffer + inst->offset);
vglVertexAttribPointerMapped(0, header->vertexBuffer); vglVertexAttribPointerMapped(0, header->vertexBuffer);
vglDrawObjects(header->primType, inst->numIndex, GL_FALSE); vglDrawObjects(header->primType, inst->numIndex);
} }
// Emulate PS2 GS alpha test FB_ONLY case: failed alpha writes to frame- but not to depth buffer // Emulate PS2 GS alpha test FB_ONLY case: failed alpha writes to frame- but not to depth buffer
src/gl/gl3shader.cpp
+11 -2
View File
@@ -105,10 +105,19 @@ char shader_source_buffer[16 * 1024];
static int static int
compileshader(GLenum type, const char **src, GLuint *shader) compileshader(GLenum type, const char **src, GLuint *shader)
{ {
GLint shdr = glCreateShader(type); #ifdef PSP2_USE_SHADER_COMPILER
// vitaGL treats GL_VERTEX_SHADER/GL_FRAGMENT_SHADER as GLSL and runs its
// translator over the source; the shaders below are Cg, so ask for the
// Cg frontend explicitly.
GLenum shdrtype = type == GL_VERTEX_SHADER ?
GL_CG_VERTEX_SHADER_EXT : GL_CG_FRAGMENT_SHADER_EXT;
#else
GLenum shdrtype = type;
#endif
GLint shdr = glCreateShader(shdrtype);
#ifdef PSP2_USE_SHADER_COMPILER #ifdef PSP2_USE_SHADER_COMPILER
GLint n; GLint n;
Glint success; GLint success;
GLint len; GLint len;
char *log; char *log;