isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-20 14:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

split 2d and 3d shaders completely

Browse Source
This commit is contained in:
olebeck 2025-07-06 01:57:14 +02:00
parent 35ee36d50e
commit b3d37a4d74
15 changed files with 251 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
miniwin/src/d3drm/backends/gxm/gxm_context.h
View File

@ -5,6 +5,11 @@
#define GXM_DISPLAY_BUFFER_COUNT 3 #define GXM_DISPLAY_BUFFER_COUNT 3
typedef struct Vertex2D {
float position[2];
float texCoord[2];
} Vertex2D;
typedef struct GXMContext { typedef struct GXMContext {
// context // context
SceUID vdmRingBufferUid; SceUID vdmRingBufferUid;
@ -36,12 +41,14 @@ typedef struct GXMContext {
SceGxmShaderPatcher* shaderPatcher; SceGxmShaderPatcher* shaderPatcher;
// clear // clear
SceGxmShaderPatcherId clearVertexProgramId; SceGxmShaderPatcherId planeVertexProgramId;
SceGxmShaderPatcherId clearFragmentProgramId; SceGxmShaderPatcherId colorFragmentProgramId;
SceGxmVertexProgram* clearVertexProgram; SceGxmShaderPatcherId imageFragmentProgramId;
SceGxmFragmentProgram* clearFragmentProgram; SceGxmVertexProgram* planeVertexProgram;
const SceGxmProgramParameter* clear_uColor; SceGxmFragmentProgram* colorFragmentProgram;
float* clearVertices; SceGxmFragmentProgram* imageFragmentProgram;
const SceGxmProgramParameter* color_uColor;
Vertex2D* clearVertices;
uint16_t* clearIndices; uint16_t* clearIndices;
// display // display

398
miniwin/src/d3drm/backends/gxm/renderer.cpp
View File

@ -20,6 +20,7 @@
#include <assert.h> #include <assert.h>
#define WITH_RAZOR
bool with_razor = false; bool with_razor = false;
bool with_razor_hud = false; bool with_razor_hud = false;
bool gxm_initialized = false; bool gxm_initialized = false;
@ -36,19 +37,16 @@ const SceGxmMultisampleMode msaaMode = SCE_GXM_MULTISAMPLE_NONE;
#define SCE_GXM_PRECOMPUTED_ALIGNMENT 16 #define SCE_GXM_PRECOMPUTED_ALIGNMENT 16
INCBIN(main_vert_gxp, "shaders/main.vert.gxp"); #define INCSHADER(filename, name) INCBIN(name, filename); const SceGxmProgram* name = (const SceGxmProgram*) _inc_##name##Data;
INCBIN(main_color_frag_gxp, "shaders/main.color.frag.gxp");
INCBIN(main_texture_frag_gxp, "shaders/main.texture.frag.gxp"); INCSHADER("shaders/main.vert.gxp", mainVertexProgramGxp);
INCBIN(image_frag_gxp, "shaders/image.frag.gxp"); INCSHADER("shaders/main.color.frag.gxp", mainColorFragmentProgramGxp);
INCBIN(clear_vert_gxp, "shaders/clear.vert.gxp"); INCSHADER("shaders/main.texture.frag.gxp", mainTextureFragmentProgramGxp);
INCBIN(clear_frag_gxp, "shaders/clear.frag.gxp");
INCSHADER("shaders/plane.vert.gxp", planeVertexProgramGxp);
INCSHADER("shaders/image.frag.gxp", imageFragmentProgramGxp);
INCSHADER("shaders/color.frag.gxp", colorFragmentProgramGxp);
const SceGxmProgram* mainVertexProgramGxp = (const SceGxmProgram*) _inc_main_vert_gxpData;
const SceGxmProgram* mainColorFragmentProgramGxp = (const SceGxmProgram*) _inc_main_color_frag_gxpData;
const SceGxmProgram* mainTextureFragmentProgramGxp = (const SceGxmProgram*) _inc_main_texture_frag_gxpData;
const SceGxmProgram* imageFragmentProgramGxp = (const SceGxmProgram*) _inc_image_frag_gxpData;
const SceGxmProgram* clearVertexProgramGxp = (const SceGxmProgram*) _inc_clear_vert_gxpData;
const SceGxmProgram* clearFragmentProgramGxp = (const SceGxmProgram*) _inc_clear_frag_gxpData;
static const SceGxmBlendInfo blendInfoOpaque = { static const SceGxmBlendInfo blendInfoOpaque = {
.colorMask = SCE_GXM_COLOR_MASK_ALL, .colorMask = SCE_GXM_COLOR_MASK_ALL,
@ -86,71 +84,72 @@ static void display_callback(const void* callback_data)
sceDisplayWaitSetFrameBuf(); sceDisplayWaitSetFrameBuf();
} }
#ifdef DEBUG #ifdef WITH_RAZOR
#include <taihen.h> #include <taihen.h>
static int load_skprx(const char* name) static int load_skprx(const char* name)
{ {
int modid = taiLoadKernelModule(name, 0, nullptr); int modid = taiLoadKernelModule(name, 0, nullptr);
if (modid < 0) { if (modid < 0) {
sceClibPrintf("%s load: 0x%08x\n", name, modid); sceClibPrintf("%s load: 0x%08x\n", name, modid);
return modid; return modid;
} }
int status; int status;
int ret = taiStartKernelModule(modid, 0, nullptr, 0, nullptr, &status); int ret = taiStartKernelModule(modid, 0, nullptr, 0, nullptr, &status);
if (ret < 0) { if (ret < 0) {
sceClibPrintf("%s start: 0x%08x\n", name, ret); sceClibPrintf("%s start: 0x%08x\n", name, ret);
} }
return ret; return ret;
}
static int load_suprx(const char* name)
{
int modid = _sceKernelLoadModule(name, 0, nullptr);
if (modid < 0) {
sceClibPrintf("%s load: 0x%08x\n", name, modid);
return modid;
}
int status;
int ret = sceKernelStartModule(modid, 0, nullptr, 0, nullptr, &status);
if (ret < 0) {
sceClibPrintf("%s start: 0x%08x\n", name, ret);
}
return ret;
}
static const bool extra_debug = false;
static void load_razor()
{
if (load_suprx("app0:librazorcapture_es4.suprx") >= 0) {
with_razor = true;
} }
if (extra_debug) { static int load_suprx(const char* name)
load_skprx("ux0:app/LEGO00001/syslibtrace.skprx"); {
load_skprx("ux0:app/LEGO00001/pamgr.skprx"); sceClibPrintf("loading %s\n", name);
int modid = _sceKernelLoadModule(name, 0, nullptr);
if (modid < 0) {
sceClibPrintf("%s load: 0x%08x\n", name, modid);
return modid;
}
int status;
int ret = sceKernelStartModule(modid, 0, nullptr, 0, nullptr, &status);
if (ret < 0) {
sceClibPrintf("%s start: 0x%08x\n", name, ret);
}
return ret;
}
if (load_suprx("app0:libperf.suprx") >= 0) { static const bool extra_debug = false;
static void load_razor()
{
if (load_suprx("app0:librazorcapture_es4.suprx") >= 0) {
with_razor = true;
} }
if (load_suprx("app0:librazorhud_es4.suprx") >= 0) { if (extra_debug) {
with_razor_hud = true; load_skprx("ux0:app/LEGO00001/syslibtrace.skprx");
load_skprx("ux0:app/LEGO00001/pamgr.skprx");
if (load_suprx("app0:libperf.suprx") >= 0) {
}
if (load_suprx("app0:librazorhud_es4.suprx") >= 0) {
with_razor_hud = true;
}
}
if (with_razor) {
//sceRazorGpuCaptureEnableSalvage("ux0:data/gpu_crash.sgx");
}
if (with_razor_hud) {
sceRazorGpuTraceSetFilename("ux0:data/gpu_trace", 3);
} }
} }
if (with_razor) {
//sceRazorGpuCaptureEnableSalvage("ux0:data/gpu_crash.sgx");
}
if (with_razor_hud) {
sceRazorGpuTraceSetFilename("ux0:data/gpu_trace", 3);
}
}
#else #else
bool load_razor() { bool load_razor() {
return true; return true;
} }
#endif #endif
int gxm_library_init() int gxm_library_init()
@ -392,18 +391,34 @@ int GXMContext::init()
tlsf_create(this->cdramPool); tlsf_create(this->cdramPool);
tlsf_add_pool(this->cdramPool, this->cdramMem, CDRAM_POOL_SIZE); tlsf_add_pool(this->cdramPool, this->cdramMem, CDRAM_POOL_SIZE);
// clear shader // register plane, color, image shaders
if (ret = SCE_ERR( sceGxmShaderPatcherRegisterProgram,
this->shaderPatcher,
planeVertexProgramGxp,
&this->planeVertexProgramId
); ret < 0) {
return ret;
}
if (ret = SCE_ERR(sceGxmShaderPatcherRegisterProgram,
this->shaderPatcher,
colorFragmentProgramGxp,
&this->colorFragmentProgramId
); ret < 0) {
return ret;
}
if (ret = SCE_ERR(sceGxmShaderPatcherRegisterProgram,
this->shaderPatcher,
imageFragmentProgramGxp,
&this->imageFragmentProgramId
); ret < 0) {
return ret;
}
if (ret = SCE_ERR( sceGxmShaderPatcherRegisterProgram, this->shaderPatcher, clearVertexProgramGxp, &this->clearVertexProgramId); ret < 0) {
return ret;
}
if (ret = SCE_ERR( sceGxmShaderPatcherRegisterProgram, this->shaderPatcher, clearFragmentProgramGxp, &this->clearFragmentProgramId); ret < 0) {
return ret;
}
{ {
GET_SHADER_PARAM(positionAttribute, clearVertexProgramGxp, "aPosition", -1); GET_SHADER_PARAM(positionAttribute, planeVertexProgramGxp, "aPosition", -1);
GET_SHADER_PARAM(texCoordAttribute, planeVertexProgramGxp, "aTexCoord", -1);
SceGxmVertexAttribute vertexAttributes[1]; SceGxmVertexAttribute vertexAttributes[2];
SceGxmVertexStream vertexStreams[1]; SceGxmVertexStream vertexStreams[1];
// position // position
@ -413,18 +428,25 @@ int GXMContext::init()
vertexAttributes[0].componentCount = 2; vertexAttributes[0].componentCount = 2;
vertexAttributes[0].regIndex = sceGxmProgramParameterGetResourceIndex(positionAttribute); vertexAttributes[0].regIndex = sceGxmProgramParameterGetResourceIndex(positionAttribute);
vertexStreams[0].stride = 4 * 2; // uv
vertexAttributes[1].streamIndex = 0;
vertexAttributes[1].offset = 8;
vertexAttributes[1].format = SCE_GXM_ATTRIBUTE_FORMAT_F32;
vertexAttributes[1].componentCount = 2;
vertexAttributes[1].regIndex = sceGxmProgramParameterGetResourceIndex(texCoordAttribute);
vertexStreams[0].stride = sizeof(float) * 4;
vertexStreams[0].indexSource = SCE_GXM_INDEX_SOURCE_INDEX_16BIT; vertexStreams[0].indexSource = SCE_GXM_INDEX_SOURCE_INDEX_16BIT;
if (ret = SCE_ERR( if (ret = SCE_ERR(
sceGxmShaderPatcherCreateVertexProgram, sceGxmShaderPatcherCreateVertexProgram,
this->shaderPatcher, this->shaderPatcher,
this->clearVertexProgramId, this->planeVertexProgramId,
vertexAttributes, vertexAttributes,
1, 2,
vertexStreams, vertexStreams,
1, 1,
&this->clearVertexProgram &this->planeVertexProgram
); ret < 0) { ); ret < 0) {
return ret; return ret;
} }
@ -432,25 +454,38 @@ int GXMContext::init()
if (ret = SCE_ERR( if (ret = SCE_ERR(
sceGxmShaderPatcherCreateFragmentProgram, sceGxmShaderPatcherCreateFragmentProgram,
this->shaderPatcher, this->shaderPatcher,
this->clearFragmentProgramId, this->colorFragmentProgramId,
SCE_GXM_OUTPUT_REGISTER_FORMAT_UCHAR4, SCE_GXM_OUTPUT_REGISTER_FORMAT_UCHAR4,
SCE_GXM_MULTISAMPLE_NONE, SCE_GXM_MULTISAMPLE_NONE,
NULL, NULL,
clearVertexProgramGxp, planeVertexProgramGxp,
&this->clearFragmentProgram &this->colorFragmentProgram
); ret < 0) {
return ret;
}
if (ret = SCE_ERR(
sceGxmShaderPatcherCreateFragmentProgram,
this->shaderPatcher,
this->imageFragmentProgramId,
SCE_GXM_OUTPUT_REGISTER_FORMAT_UCHAR4,
SCE_GXM_MULTISAMPLE_NONE,
&blendInfoTransparent,
planeVertexProgramGxp,
&this->imageFragmentProgram
); ret < 0) { ); ret < 0) {
return ret; return ret;
} }
} }
// clear uniforms this->color_uColor = sceGxmProgramFindParameterByName(colorFragmentProgramGxp, "uColor"); // vec4
this->clear_uColor = sceGxmProgramFindParameterByName(clearFragmentProgramGxp, "uColor"); // vec4
this->clearVertices = static_cast<Vertex2D*>(this->alloc(sizeof(Vertex2D)*4, 4));
this->clearVertices[0] = Vertex2D{ .position = {-1.0, 1.0}, .texCoord = {0, 0} };
this->clearVertices[1] = Vertex2D{ .position = {1.0, 1.0}, .texCoord = {0, 0} };
this->clearVertices[2] = Vertex2D{ .position = {-1.0, -1.0}, .texCoord = {0, 0} };
this->clearVertices[3] = Vertex2D{ .position = {1.0,-1.0}, .texCoord = {0, 0} };
this->clearVertices = static_cast<float*>(this->alloc(sizeof(float)*4*2, 4));
this->clearVertices[0] = -1.0; this->clearVertices[1] = 1.0;
this->clearVertices[2] = 1.0; this->clearVertices[3] = 1.0;
this->clearVertices[4] = -1.0; this->clearVertices[5] = -1.0;
this->clearVertices[6] = 1.0; this->clearVertices[7] = -1.0;
this->clearIndices = static_cast<uint16_t*>(this->alloc(sizeof(uint16_t) * 4, 4)); this->clearIndices = static_cast<uint16_t*>(this->alloc(sizeof(uint16_t) * 4, 4));
this->clearIndices[0] = 0; this->clearIndices[0] = 0;
this->clearIndices[1] = 1; this->clearIndices[1] = 1;
@ -495,21 +530,18 @@ void GXMContext::clear(float r, float g, float b, bool new_scene) {
float color[] = {r, g, b, 1}; float color[] = {r, g, b, 1};
sceGxmSetVertexProgram(this->context, this->clearVertexProgram); sceGxmSetVertexProgram(this->context, this->planeVertexProgram);
sceGxmSetFragmentProgram(this->context, this->clearFragmentProgram); sceGxmSetFragmentProgram(this->context, this->colorFragmentProgram);
void* vertUniforms; void* vertUniforms;
void* fragUniforms; void* fragUniforms;
sceGxmReserveVertexDefaultUniformBuffer(gxm->context, &vertUniforms); sceGxmReserveVertexDefaultUniformBuffer(gxm->context, &vertUniforms);
sceGxmReserveFragmentDefaultUniformBuffer(gxm->context, &fragUniforms); sceGxmReserveFragmentDefaultUniformBuffer(gxm->context, &fragUniforms);
if(!fragUniforms) {
SDL_Log("failed to reserve fragment uniform buffer!!");
}
sceGxmSetVertexStream(gxm->context, 0, this->clearVertices); sceGxmSetVertexStream(gxm->context, 0, this->clearVertices);
sceGxmSetUniformDataF(fragUniforms, this->clear_uColor, 0, 4, color); sceGxmSetUniformDataF(fragUniforms, this->color_uColor, 0, 4, color);
sceGxmSetFrontDepthFunc(gxm->context, SCE_GXM_DEPTH_FUNC_ALWAYS);
sceGxmDraw(gxm->context, SCE_GXM_PRIMITIVE_TRIANGLE_STRIP, SCE_GXM_INDEX_FORMAT_U16, this->clearIndices, 4); sceGxmDraw(gxm->context, SCE_GXM_PRIMITIVE_TRIANGLE_STRIP, SCE_GXM_INDEX_FORMAT_U16, this->clearIndices, 4);
if(new_scene) { if(new_scene) {
sceGxmEndScene(this->context, nullptr, nullptr); sceGxmEndScene(this->context, nullptr, nullptr);
@ -659,14 +691,6 @@ GXMRenderer::GXMRenderer(DWORD width, DWORD height)
); ret < 0) { ); ret < 0) {
return; return;
} }
if (ret = SCE_ERR(
sceGxmShaderPatcherRegisterProgram,
gxm->shaderPatcher,
imageFragmentProgramGxp,
&this->imageFragmentProgramId
); ret < 0) {
return;
}
// main shader // main shader
{ {
@ -770,40 +794,27 @@ GXMRenderer::GXMRenderer(DWORD width, DWORD height)
return; return;
} }
// image
if (ret = SCE_ERR(
sceGxmShaderPatcherCreateFragmentProgram,
gxm->shaderPatcher,
this->imageFragmentProgramId,
SCE_GXM_OUTPUT_REGISTER_FORMAT_UCHAR4,
msaaMode,
&blendInfoTransparent,
mainVertexProgramGxp,
&this->imageFragmentProgram
); ret < 0) {
return;
}
// vertex uniforms // vertex uniforms
//this->uNormalMatrix = sceGxmProgramFindParameterByName(mainVertexProgramGxp, "uNormalMatrix");
//this->uWorldViewProjection = sceGxmProgramFindParameterByName(mainVertexProgramGxp, "uWorldViewProjection");
//this->uWorld = sceGxmProgramFindParameterByName(mainVertexProgramGxp, "uWorld");
//this->uViewInverse = sceGxmProgramFindParameterByName(mainVertexProgramGxp, "uViewInverse");
this->uModelViewMatrix = sceGxmProgramFindParameterByName(mainVertexProgramGxp, "uModelViewMatrix"); this->uModelViewMatrix = sceGxmProgramFindParameterByName(mainVertexProgramGxp, "uModelViewMatrix");
this->uNormalMatrix = sceGxmProgramFindParameterByName(mainVertexProgramGxp, "uNormalMatrix"); this->uNormalMatrix = sceGxmProgramFindParameterByName(mainVertexProgramGxp, "uNormalMatrix");
this->uProjectionMatrix = sceGxmProgramFindParameterByName(mainVertexProgramGxp, "uProjectionMatrix"); this->uProjectionMatrix = sceGxmProgramFindParameterByName(mainVertexProgramGxp, "uProjectionMatrix");
// fragment uniforms // fragment uniforms
this->color_uLights = sceGxmProgramFindParameterByName(mainColorFragmentProgramGxp, "uLights"); // SceneLight[3] this->uLights = sceGxmProgramFindParameterByName(mainColorFragmentProgramGxp, "uLights"); // SceneLight[2]
this->color_uAmbientLight = sceGxmProgramFindParameterByName(mainColorFragmentProgramGxp, "uAmbientLight"); // vec3 this->uAmbientLight = sceGxmProgramFindParameterByName(mainColorFragmentProgramGxp, "uAmbientLight"); // vec3
this->color_uShininess = sceGxmProgramFindParameterByName(mainColorFragmentProgramGxp, "uShininess"); // float this->uShininess = sceGxmProgramFindParameterByName(mainColorFragmentProgramGxp, "uShininess"); // float
this->color_uColor = sceGxmProgramFindParameterByName(mainColorFragmentProgramGxp, "uColor"); // vec4 this->uColor = sceGxmProgramFindParameterByName(mainColorFragmentProgramGxp, "uColor"); // vec4
this->texture_uLights = sceGxmProgramFindParameterByName(mainTextureFragmentProgramGxp, "uLights"); // SceneLight[3]
this->texture_uAmbientLight = sceGxmProgramFindParameterByName(mainTextureFragmentProgramGxp, "uAmbientLight"); // vec3
this->texture_uShininess = sceGxmProgramFindParameterByName(mainTextureFragmentProgramGxp, "uShininess"); // float
this->texture_uColor = sceGxmProgramFindParameterByName(mainTextureFragmentProgramGxp, "uColor"); // vec4
for (int i = 0; i < GXM_FRAGMENT_BUFFER_COUNT; i++) { for (int i = 0; i < GXM_FRAGMENT_BUFFER_COUNT; i++) {
this->lights[i] = static_cast<GXMSceneLightUniform*>(gxm->alloc(sizeof(GXMSceneLightUniform), 4)); this->lights[i] = static_cast<GXMSceneLightUniform*>(gxm->alloc(sizeof(GXMSceneLightUniform), 4));
} }
for (int i = 0; i < GXM_VERTEX_BUFFER_COUNT; i++) { for (int i = 0; i < GXM_VERTEX_BUFFER_COUNT; i++) {
this->quadVertices[i] = static_cast<Vertex*>(gxm->alloc(sizeof(Vertex) * 4 * 50, 4)); this->quadVertices[i] = static_cast<Vertex2D*>(gxm->alloc(sizeof(Vertex2D) * 4 * 50, 4));
} }
this->quadIndices = static_cast<uint16_t*>(gxm->alloc(sizeof(uint16_t) * 4, 4)); this->quadIndices = static_cast<uint16_t*>(gxm->alloc(sizeof(uint16_t) * 4, 4));
this->quadIndices[0] = 0; this->quadIndices[0] = 0;
@ -1407,15 +1418,17 @@ HRESULT GXMRenderer::BeginFrame()
lightData->lights[i].color[2] = light.color.b; lightData->lights[i].color[2] = light.color.b;
lightData->lights[i].color[3] = light.color.a; lightData->lights[i].color[3] = light.color.a;
lightData->lights[i].position[0] = light.position.x; bool isDirectional = light.directional == 1.0;
lightData->lights[i].position[1] = light.position.y; if(isDirectional) {
lightData->lights[i].position[2] = light.position.z; lightData->lights[i].vec[0] = light.direction.x;
lightData->lights[i].position[3] = light.positional; lightData->lights[i].vec[1] = light.direction.y;
lightData->lights[i].vec[2] = light.direction.z;
lightData->lights[i].direction[0] = light.direction.x; } else {
lightData->lights[i].direction[1] = light.direction.y; lightData->lights[i].vec[0] = light.position.x;
lightData->lights[i].direction[2] = light.direction.z; lightData->lights[i].vec[1] = light.position.y;
lightData->lights[i].direction[3] = light.directional; lightData->lights[i].vec[2] = light.position.z;
}
lightData->lights[i].isDirectional = isDirectional;
i++; i++;
} }
sceGxmSetFragmentUniformBuffer(gxm->context, 0, lightData); sceGxmSetFragmentUniformBuffer(gxm->context, 0, lightData);
@ -1437,6 +1450,15 @@ static void transpose4x4(const float src[4][4], float dst[4][4])
} }
} }
static void transpose3x3(const float src[3][3], float dst[3][3])
{
for (int i = 0; i < 3; ++i) {
for (int j = 0; j < 3; ++j) {
dst[j][i] = src[i][j];
}
}
}
static const D3DRMMATRIX4D identity4x4 = { static const D3DRMMATRIX4D identity4x4 = {
{1.0, 0.0, 0.0, 0.0}, {1.0, 0.0, 0.0, 0.0},
{0.0, 1.0, 0.0, 0.0}, {0.0, 1.0, 0.0, 0.0},
@ -1461,65 +1483,54 @@ void GXMRenderer::SubmitDraw(
{ {
auto& mesh = m_meshes[meshId]; auto& mesh = m_meshes[meshId];
#ifdef DEBUG
char marker[256]; char marker[256];
snprintf(marker, sizeof(marker), "SubmitDraw: %d", meshId); snprintf(marker, sizeof(marker), "SubmitDraw: %d", meshId);
sceGxmPushUserMarker(gxm->context, marker); sceGxmPushUserMarker(gxm->context, marker);
#endif
sceGxmSetVertexProgram(gxm->context, this->mainVertexProgram);
bool textured = appearance.textureId != NO_TEXTURE_ID; bool textured = appearance.textureId != NO_TEXTURE_ID;
const SceGxmFragmentProgram *fragmentProgram; const SceGxmFragmentProgram *fragmentProgram;
if(this->transparencyEnabled) { if(this->transparencyEnabled) {
fragmentProgram = textured ? this->blendedTextureFragmentProgram : this->blendedColorFragmentProgram; fragmentProgram = textured ? this->blendedTextureFragmentProgram : this->blendedColorFragmentProgram;
} else { } else {
fragmentProgram = textured ? this->opaqueTextureFragmentProgram : this->opaqueColorFragmentProgram; fragmentProgram = textured ? this->opaqueTextureFragmentProgram : this->opaqueColorFragmentProgram;
} }
sceGxmSetVertexProgram(gxm->context, this->mainVertexProgram);
sceGxmSetFragmentProgram(gxm->context, fragmentProgram); sceGxmSetFragmentProgram(gxm->context, fragmentProgram);
const SceGxmProgramParameter* uColor = textured ? this->texture_uColor : this->color_uColor; void* vertUniforms;
const SceGxmProgramParameter* uShininess = textured ? this->texture_uShininess : this->color_uShininess; void* fragUniforms;
sceGxmReserveVertexDefaultUniformBuffer(gxm->context, &vertUniforms);
sceGxmReserveFragmentDefaultUniformBuffer(gxm->context, &fragUniforms);
// vertex uniforms
sceGxmSetUniformDataF(vertUniforms, this->uModelViewMatrix, 0, 4*4, &modelViewMatrix[0][0]);
sceGxmSetUniformDataF(vertUniforms, this->uNormalMatrix, 0, 3*3, &normalMatrix[0][0]);
sceGxmSetUniformDataF(vertUniforms, this->uProjectionMatrix, 0, 4*4, &this->m_projection[0][0]);
// fragment uniforms
float color[4] = { float color[4] = {
appearance.color.r / 255.0f, appearance.color.r / 255.0f,
appearance.color.g / 255.0f, appearance.color.g / 255.0f,
appearance.color.b / 255.0f, appearance.color.b / 255.0f,
appearance.color.a / 255.0f appearance.color.a / 255.0f
}; };
sceGxmSetUniformDataF(fragUniforms, this->uColor, 0, 4, color);
void* vertUniforms; sceGxmSetUniformDataF(fragUniforms, this->uShininess, 0, 1, &appearance.shininess);
void* fragUniforms;
#ifdef GXM_PRECOMPUTE
sceGxmSetPrecomputedVertexState(gxm->context, &mesh.vertexState[this->currentVertexBufferIndex]);
sceGxmSetPrecomputedFragmentState(gxm->context, &mesh.fragmentState[this->currentFragmentBufferIndex]);
vertUniforms = sceGxmPrecomputedVertexStateGetDefaultUniformBuffer(&mesh.vertexState[this->currentVertexBufferIndex]);
fragUniforms = sceGxmPrecomputedFragmentStateGetDefaultUniformBuffer(&mesh.fragmentState[this->currentFragmentBufferIndex]);
#else
sceGxmReserveVertexDefaultUniformBuffer(gxm->context, &vertUniforms);
sceGxmReserveFragmentDefaultUniformBuffer(gxm->context, &fragUniforms);
#endif
SET_UNIFORM(vertUniforms, this->uModelViewMatrix, modelViewMatrix);
SET_UNIFORM(vertUniforms, this->uProjectionMatrix, m_projection);
sceGxmSetUniformDataF(vertUniforms, this->uNormalMatrix, 0, 9, static_cast<const float*>(normalMatrix[0]));
SET_UNIFORM(fragUniforms, uColor, color);
SET_UNIFORM(fragUniforms, uShininess, appearance.shininess);
if (textured) { if (textured) {
auto& texture = m_textures[appearance.textureId]; auto& texture = m_textures[appearance.textureId];
this->UseTexture(texture); this->UseTexture(texture);
} }
#ifdef GXM_PRECOMPUTE
sceGxmDrawPrecomputed(gxm->context, &mesh.drawState);
sceGxmSetPrecomputedVertexState(gxm->gxm->context, NULL);
sceGxmSetPrecomputedFragmentState(gxm->context, NULL);
#else
sceGxmSetVertexStream(gxm->context, 0, mesh.vertexBuffer); sceGxmSetVertexStream(gxm->context, 0, mesh.vertexBuffer);
sceGxmSetFrontDepthFunc(gxm->context, SCE_GXM_DEPTH_FUNC_LESS);
sceGxmDraw(gxm->context, SCE_GXM_PRIMITIVE_TRIANGLES, SCE_GXM_INDEX_FORMAT_U16, mesh.indexBuffer, mesh.indexCount); sceGxmDraw(gxm->context, SCE_GXM_PRIMITIVE_TRIANGLES, SCE_GXM_INDEX_FORMAT_U16, mesh.indexBuffer, mesh.indexCount);
#endif
#ifdef DEBUG
sceGxmPopUserMarker(gxm->context); sceGxmPopUserMarker(gxm->context);
#endif
} }
HRESULT GXMRenderer::FinalizeFrame() HRESULT GXMRenderer::FinalizeFrame()
@ -1564,15 +1575,17 @@ void GXMRenderer::Draw2DImage(Uint32 textureId, const SDL_Rect& srcRect, const S
{ {
this->StartScene(); this->StartScene();
#ifdef DEBUG
char marker[256]; char marker[256];
snprintf(marker, sizeof(marker), "Draw2DImage: %d", textureId); snprintf(marker, sizeof(marker), "Draw2DImage: %d", textureId);
sceGxmPushUserMarker(gxm->context, marker); sceGxmPushUserMarker(gxm->context, marker);
#endif
sceGxmSetVertexProgram(gxm->context, this->mainVertexProgram); sceGxmSetVertexProgram(gxm->context, gxm->planeVertexProgram);
if(textureId != NO_TEXTURE_ID) { if(textureId != NO_TEXTURE_ID) {
sceGxmSetFragmentProgram(gxm->context, this->imageFragmentProgram); sceGxmSetFragmentProgram(gxm->context, gxm->imageFragmentProgram);
} else { } else {
sceGxmSetFragmentProgram(gxm->context, gxm->clearFragmentProgram); sceGxmSetFragmentProgram(gxm->context, gxm->colorFragmentProgram);
} }
void* vertUniforms; void* vertUniforms;
@ -1585,8 +1598,8 @@ void GXMRenderer::Draw2DImage(Uint32 textureId, const SDL_Rect& srcRect, const S
float top = -this->m_viewportTransform.offsetY / this->m_viewportTransform.scale; float top = -this->m_viewportTransform.offsetY / this->m_viewportTransform.scale;
float bottom = (this->m_height - this->m_viewportTransform.offsetY) / this->m_viewportTransform.scale; float bottom = (this->m_height - this->m_viewportTransform.offsetY) / this->m_viewportTransform.scale;
#define virtualToNDCX(x) (((x - left) / (right - left))); #define virtualToNDCX(x) (((x - left) / (right - left)) * 2 - 1);
#define virtualToNDCY(y) (((y - top) / (bottom - top))); #define virtualToNDCY(y) -(((y - top) / (bottom - top)) * 2 - 1);
float x1_virtual = static_cast<float>(dstRect.x); float x1_virtual = static_cast<float>(dstRect.x);
float y1_virtual = static_cast<float>(dstRect.y); float y1_virtual = static_cast<float>(dstRect.y);
@ -1598,25 +1611,6 @@ void GXMRenderer::Draw2DImage(Uint32 textureId, const SDL_Rect& srcRect, const S
float x2 = virtualToNDCX(x2_virtual); float x2 = virtualToNDCX(x2_virtual);
float y2 = virtualToNDCY(y2_virtual); float y2 = virtualToNDCY(y2_virtual);
D3DRMMATRIX4D projection;
CreateOrthoMatrix(0.0, 1.0, 1.0, 0.0, projection);
static const Matrix3x3 normal = {
{1.f, 0.f, 0.f},
{0.f, 1.f, 0.f},
{0.f, 0.f, 1.f}
};
D3DRMMATRIX4D identity;
memset(identity, 0, sizeof(identity));
identity[0][0] = 1.0f;
identity[1][1] = 1.0f;
identity[2][2] = 1.0f;
identity[3][3] = 1.0f;
SET_UNIFORM(vertUniforms, this->uModelViewMatrix, identity); // float4x4
SET_UNIFORM(vertUniforms, this->uNormalMatrix, normal); // float3x3
SET_UNIFORM(vertUniforms, this->uProjectionMatrix, projection); // float4x4
float u1 = 0.0; float u1 = 0.0;
float v1 = 0.0; float v1 = 0.0;
float u2 = 0.0; float u2 = 0.0;
@ -1633,21 +1627,25 @@ void GXMRenderer::Draw2DImage(Uint32 textureId, const SDL_Rect& srcRect, const S
u2 = static_cast<float>(srcRect.x + srcRect.w) / texW; u2 = static_cast<float>(srcRect.x + srcRect.w) / texW;
v2 = static_cast<float>(srcRect.y + srcRect.h) / texH; v2 = static_cast<float>(srcRect.y + srcRect.h) / texH;
} else { } else {
SET_UNIFORM(fragUniforms, gxm->clear_uColor, color); SET_UNIFORM(fragUniforms, gxm->color_uColor, color);
} }
Vertex* quadVertices = this->QuadVerticesBuffer(); Vertex2D* quadVertices = this->QuadVerticesBuffer();
quadVertices[0] = Vertex{.position = {x1, y1, 0}, .normal = {0, 0, 0}, .texCoord = {u1, v1}}; quadVertices[0] = Vertex2D{.position = {x1, y1}, .texCoord = {u1, v1}};
quadVertices[1] = Vertex{.position = {x2, y1, 0}, .normal = {0, 0, 0}, .texCoord = {u2, v1}}; quadVertices[1] = Vertex2D{.position = {x2, y1}, .texCoord = {u2, v1}};
quadVertices[2] = Vertex{.position = {x1, y2, 0}, .normal = {0, 0, 0}, .texCoord = {u1, v2}}; quadVertices[2] = Vertex2D{.position = {x1, y2}, .texCoord = {u1, v2}};
quadVertices[3] = Vertex{.position = {x2, y2, 0}, .normal = {0, 0, 0}, .texCoord = {u2, v2}}; quadVertices[3] = Vertex2D{.position = {x2, y2}, .texCoord = {u2, v2}};
sceGxmSetVertexStream(gxm->context, 0, quadVertices); sceGxmSetVertexStream(gxm->context, 0, quadVertices);
sceGxmSetFrontDepthWriteEnable(gxm->context, SCE_GXM_DEPTH_WRITE_DISABLED); sceGxmSetFrontDepthWriteEnable(gxm->context, SCE_GXM_DEPTH_WRITE_DISABLED);
sceGxmSetFrontDepthFunc(gxm->context, SCE_GXM_DEPTH_FUNC_ALWAYS);
sceGxmDraw(gxm->context, SCE_GXM_PRIMITIVE_TRIANGLE_STRIP, SCE_GXM_INDEX_FORMAT_U16, this->quadIndices, 4); sceGxmDraw(gxm->context, SCE_GXM_PRIMITIVE_TRIANGLE_STRIP, SCE_GXM_INDEX_FORMAT_U16, this->quadIndices, 4);
sceGxmSetFrontDepthWriteEnable(gxm->context, SCE_GXM_DEPTH_WRITE_ENABLED); sceGxmSetFrontDepthWriteEnable(gxm->context, SCE_GXM_DEPTH_WRITE_ENABLED);
#ifdef DEBUG
sceGxmPopUserMarker(gxm->context); sceGxmPopUserMarker(gxm->context);
#endif
} }
void GXMRenderer::SetDither(bool dither) void GXMRenderer::SetDither(bool dither)
@ -1665,8 +1663,8 @@ void GXMRenderer::Download(SDL_Surface* target)
SDL_Surface* src = SDL_CreateSurfaceFrom( SDL_Surface* src = SDL_CreateSurfaceFrom(
VITA_GXM_SCREEN_WIDTH, VITA_GXM_SCREEN_WIDTH,
VITA_GXM_SCREEN_HEIGHT, VITA_GXM_SCREEN_HEIGHT,
SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGRA8888,
gxm->displayBuffers[gxm->frontBufferIndex], gxm->displayBuffers[gxm->backBufferIndex],
VITA_GXM_SCREEN_STRIDE*4 VITA_GXM_SCREEN_STRIDE*4
); );
SDL_BlitSurfaceScaled(src, &srcRect, target, nullptr, SDL_SCALEMODE_NEAREST); SDL_BlitSurfaceScaled(src, &srcRect, target, nullptr, SDL_SCALEMODE_NEAREST);

4
miniwin/src/d3drm/backends/gxm/shaders/Makefile
View File

@ -1,4 +1,4 @@
shaders += clear.vert.gxp clear.frag.gxp image.frag.gxp shaders += plane.vert.gxp color.frag.gxp image.frag.gxp
shaders += main.vert.gxp main.color.frag.gxp main.texture.frag.gxp shaders += main.vert.gxp main.color.frag.gxp main.texture.frag.gxp
PERFS = $(shaders:.gxp=.perf.txt) PERFS = $(shaders:.gxp=.perf.txt)
@ -24,4 +24,4 @@ main.texture.frag.gxp: main.frag.cg | cache
./psp2cgc.exe $(CGCFLAGS) -DTEXTURED=1 -profile sce_fp_psp2 $< -o $@ ./psp2cgc.exe $(CGCFLAGS) -DTEXTURED=1 -profile sce_fp_psp2 $< -o $@
%.perf.txt: %.gxp %.perf.txt: %.gxp
./psp2shaderperf.exe -disasm $< > $@ ./psp2shaderperf.exe -stats -symbols -disasm $< > $@

5
miniwin/src/d3drm/backends/gxm/shaders/clear.vert.cg
View File

@ -1,5 +0,0 @@
float4 main(float2 aPosition : POSITION) : POSITION
{
return float4(aPosition, 1.f, 1.f);
}

BIN
miniwin/src/d3drm/backends/gxm/shaders/clear.vert.gxp
View File

Binary file not shown.

0
miniwin/src/d3drm/backends/gxm/shaders/clear.frag.cg → miniwin/src/d3drm/backends/gxm/shaders/color.frag.cg
View File

BIN
miniwin/src/d3drm/backends/gxm/shaders/clear.frag.gxp → miniwin/src/d3drm/backends/gxm/shaders/color.frag.gxp
View File

Binary file not shown.

4
miniwin/src/d3drm/backends/gxm/shaders/image.frag.cg
View File

@ -1,8 +1,6 @@
void main( void main(
float4 vPosition : POSITION, float4 vPosition : POSITION,
float3 vViewPos : TEXCOORD1, float2 vTexCoord : TEXCOORD0,
float3 vNormal : TEXCOORD2,
float2 vTexCoord : TEXCOORD3,
uniform sampler2D uTexture, uniform sampler2D uTexture,

BIN
miniwin/src/d3drm/backends/gxm/shaders/image.frag.gxp
View File

Binary file not shown.

BIN
miniwin/src/d3drm/backends/gxm/shaders/main.color.frag.gxp
View File

Binary file not shown.

31
miniwin/src/d3drm/backends/gxm/shaders/main.frag.cg
View File

@ -1,7 +1,7 @@
struct SceneLight { struct SceneLight {
float4 color; float4 color;
float4 position; float4 vec;
float4 direction; float isDirectional;
}; };
void main( void main(
@ -27,30 +27,21 @@ void main(
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
float3 lightColor = uLights[i].color.rgb; float3 lightColor = uLights[i].color.rgb;
float isDirectional = uLights[i].direction.w; float isDirectional = uLights[i].isDirectional;
float isPositional = uLights[i].position.w;
// TODO: make faster by removing the if statements float3 lightVec = normalize(lerp(uLights[i].vec.xyz - vViewPos, -uLights[i].vec.xyz, isDirectional));
// directional
float3 lightVec; float3 halfVec = normalize(viewVec + lightVec);
if (isDirectional) { float dotNL = max(dot(vNormal, lightVec), 0.0);
lightVec = -normalize(uLights[i].direction.xyz); float dotNH = max(dot(vNormal, halfVec), 0.0);
} else {
lightVec = uLights[i].position.xyz - vViewPos;
}
lightVec = normalize(lightVec);
// Diffuse contribution // Diffuse contribution
float dotNL = max(dot(vNormal, lightVec), 0.0);
diffuse += dotNL * lightColor; diffuse += dotNL * lightColor;
// Specular // Specular
//float enableSpec = (dotNL > 0.0) * (uShininess > 0.0); float spec = pow(dotNH, uShininess);
if (dotNL > 0.0 && uShininess > 0.0) { if(uShininess > 0.0) {
float3 halfVec = normalize(lightVec + viewVec); specular += spec * lightColor * sign(dotNL);
float dotNH = max(dot(vNormal, halfVec), 0.0);
float spec = pow(dotNH, uShininess);
specular += spec * lightColor;
} }
} }

BIN
miniwin/src/d3drm/backends/gxm/shaders/main.texture.frag.gxp
View File

Binary file not shown.

11
miniwin/src/d3drm/backends/gxm/shaders/plane.vert.cg Normal file
View File

@ -0,0 +1,11 @@
void main(
float2 aPosition : POSITION,
float2 aTexCoord : TEXCOORD0,
out float4 vPosition : POSITION,
out float2 vTexCoord : TEXCOORD0
) : POSITION {
vPosition = float4(aPosition, 1.f, 1.f);
vTexCoord = aTexCoord;
}

BIN
miniwin/src/d3drm/backends/gxm/shaders/plane.vert.gxp Normal file
View File

Binary file not shown.

34
miniwin/src/internal/d3drmrenderer_gxm.h
View File

@ -56,12 +56,11 @@ typedef struct GXMDisplayData {
struct SceneLightGXM { struct SceneLightGXM {
float color[4]; float color[4];
float position[4]; float vec[4];
float direction[4]; float isDirectional;
float _align;
}; };
static_assert(sizeof(SceneLightGXM) == 4*4*3);
struct GXMSceneLightUniform { struct GXMSceneLightUniform {
SceneLightGXM lights[2]; SceneLightGXM lights[2];
float ambientLight[3]; float ambientLight[3];
@ -121,8 +120,8 @@ class GXMRenderer : public Direct3DRMRenderer {
return gxmTexture; return gxmTexture;
} }
inline Vertex* QuadVerticesBuffer() { inline Vertex2D* QuadVerticesBuffer() {
Vertex* verts = &this->quadVertices[this->currentVertexBufferIndex][this->quadsUsed*4]; Vertex2D* verts = &this->quadVertices[this->currentVertexBufferIndex][this->quadsUsed*4];
this->quadsUsed += 1; this->quadsUsed += 1;
if(this->quadsUsed >= 50) { if(this->quadsUsed >= 50) {
SDL_Log("QuadVerticesBuffer overflow"); SDL_Log("QuadVerticesBuffer overflow");
@ -146,35 +145,32 @@ class GXMRenderer : public Direct3DRMRenderer {
SceGxmShaderPatcherId mainVertexProgramId; SceGxmShaderPatcherId mainVertexProgramId;
SceGxmShaderPatcherId mainColorFragmentProgramId; SceGxmShaderPatcherId mainColorFragmentProgramId;
SceGxmShaderPatcherId mainTextureFragmentProgramId; SceGxmShaderPatcherId mainTextureFragmentProgramId;
SceGxmShaderPatcherId imageFragmentProgramId;
SceGxmVertexProgram* mainVertexProgram; SceGxmVertexProgram* mainVertexProgram;
// with lighting
SceGxmFragmentProgram* opaqueColorFragmentProgram; SceGxmFragmentProgram* opaqueColorFragmentProgram;
SceGxmFragmentProgram* blendedColorFragmentProgram; SceGxmFragmentProgram* blendedColorFragmentProgram;
SceGxmFragmentProgram* opaqueTextureFragmentProgram; SceGxmFragmentProgram* opaqueTextureFragmentProgram;
SceGxmFragmentProgram* blendedTextureFragmentProgram; SceGxmFragmentProgram* blendedTextureFragmentProgram;
// no lighting
SceGxmFragmentProgram* imageFragmentProgram;
// main shader vertex uniforms // main shader vertex uniforms
//const SceGxmProgramParameter* uNormalMatrix;
//const SceGxmProgramParameter* uWorldViewProjection;
//const SceGxmProgramParameter* uWorld;
//const SceGxmProgramParameter* uViewInverse;
const SceGxmProgramParameter* uModelViewMatrix; const SceGxmProgramParameter* uModelViewMatrix;
const SceGxmProgramParameter* uNormalMatrix; const SceGxmProgramParameter* uNormalMatrix;
const SceGxmProgramParameter* uProjectionMatrix; const SceGxmProgramParameter* uProjectionMatrix;
// main shader fragment uniforms // main shader fragment uniforms
const SceGxmProgramParameter* color_uLights; const SceGxmProgramParameter* uShininess;
const SceGxmProgramParameter* color_uAmbientLight; const SceGxmProgramParameter* uColor;
const SceGxmProgramParameter* color_uShininess; const SceGxmProgramParameter* uLights;
const SceGxmProgramParameter* color_uColor; const SceGxmProgramParameter* uAmbientLight;
const SceGxmProgramParameter* texture_uLights;
const SceGxmProgramParameter* texture_uAmbientLight;
const SceGxmProgramParameter* texture_uShininess;
const SceGxmProgramParameter* texture_uColor;
// uniforms / quad meshes // uniforms / quad meshes
GXMSceneLightUniform* lights[GXM_FRAGMENT_BUFFER_COUNT]; GXMSceneLightUniform* lights[GXM_FRAGMENT_BUFFER_COUNT];
Vertex* quadVertices[GXM_VERTEX_BUFFER_COUNT]; Vertex2D* quadVertices[GXM_VERTEX_BUFFER_COUNT];
uint16_t* quadIndices; uint16_t* quadIndices;
int quadsUsed = 0; int quadsUsed = 0;