VERSIÓ 1.6.2:
- [FIX] El buffer en que es guardaba l'arxiu de text dels shaders no s'alliberava. - [NEW] Traça per a vore - [NEW] Millors logs de errors de shaders - [NEW] Afegit mode 'consola' per a quan s'executa desde consola sense entorn gràfic
This commit is contained in:
1 parent
9e2b89a4ee
commit
c0faf074fe
6 files changed
+75
-20
No files matched your search
@@ -21,6 +21,34 @@
|
||||
#include <SDL3/SDL_opengl_glext.h>
|
||||
#endif
|
||||
|
||||
void checkGLError() {
|
||||
GLenum err = glGetError();
|
||||
if (err != GL_NO_ERROR) {
|
||||
fprintf(stderr, "OpenGL error 0x%04X\n", err);
|
||||
|
||||
// Mapeo rápido de los errores más comunes de OpenGL
|
||||
while (err != GL_NO_ERROR) {
|
||||
const char* errStr = "";
|
||||
switch (err) {
|
||||
case GL_INVALID_ENUM: errStr = "GL_INVALID_ENUM"; break;
|
||||
case GL_INVALID_VALUE: errStr = "GL_INVALID_STRING/VALUE"; break;
|
||||
case GL_INVALID_OPERATION: errStr = "GL_INVALID_OPERATION"; break;
|
||||
case GL_OUT_OF_MEMORY: errStr = "GL_OUT_OF_MEMORY"; break;
|
||||
case GL_INVALID_FRAMEBUFFER_OPERATION: errStr = "GL_INVALID_FRAMEBUFFER_OPERATION"; break;
|
||||
default: errStr = "UNKNOWN_ERROR"; break;
|
||||
}
|
||||
fprintf(stderr, " -> Código de error: %s (0x%04X)\n", errStr, err);
|
||||
err = glGetError();
|
||||
}
|
||||
::exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
#define GL_CHECK(stmt) do { \
|
||||
stmt; \
|
||||
checkGLError(#stmt, __FILE__, __LINE__); \
|
||||
} while (0)
|
||||
|
||||
namespace backend
|
||||
{
|
||||
namespace shader
|
||||
@@ -132,18 +160,25 @@ namespace backend
|
||||
glAttachShader(programId, vtxShaderId);
|
||||
glAttachShader(programId, fragShaderId);
|
||||
glLinkProgram(programId);
|
||||
glValidateProgram(programId);
|
||||
//glValidateProgram(programId);
|
||||
|
||||
// Check the status of the compile/link
|
||||
GLint logLen;
|
||||
glGetProgramiv(programId, GL_INFO_LOG_LENGTH, &logLen);
|
||||
if (logLen > 0)
|
||||
GLint linkStatus = GL_FALSE;
|
||||
glGetProgramiv(programId, GL_LINK_STATUS, &linkStatus);
|
||||
|
||||
if (linkStatus != GL_TRUE)
|
||||
{
|
||||
char* log = (char*) malloc(logLen * sizeof(char));
|
||||
// Show any errors as appropriate
|
||||
glGetProgramInfoLog(programId, logLen, &logLen, log);
|
||||
std::cout << "Prog Info Log: " << std::endl << log << std::endl;
|
||||
free(log);
|
||||
std::cout << "Error en el enlazado (Linking) del programa!" << std::endl;
|
||||
GLint logLen = 0;
|
||||
glGetProgramiv(programId, GL_INFO_LOG_LENGTH, &logLen);
|
||||
if (logLen > 0)
|
||||
{
|
||||
char* log = (char*)malloc(logLen);
|
||||
glGetProgramInfoLog(programId, logLen, &logLen, log);
|
||||
std::cout << "Program Link Log:\n" << log << std::endl;
|
||||
free(log);
|
||||
}
|
||||
glDeleteProgram(programId);
|
||||
programId = 0;
|
||||
}
|
||||
}
|
||||
if (vtxShaderId) glDeleteShader(vtxShaderId);
|
||||
@@ -165,12 +200,6 @@ namespace backend
|
||||
SDL_GetWindowSize(video::window, &win_size.x, &win_size.y);
|
||||
SDL_GetTextureSize(video::tex_shader, &tex_size.x, &tex_size.y);
|
||||
|
||||
int filesize;
|
||||
char *vshaderfile = mini::file::getfilebuffer(vShaderSource, filesize, true);
|
||||
|
||||
char *fshaderfile = nullptr;
|
||||
if (fShaderSource) { fshaderfile = mini::file::getfilebuffer(fShaderSource, filesize, true); }
|
||||
|
||||
SDL_PropertiesID props = SDL_GetTextureProperties(video::tex_shader);
|
||||
int access = SDL_GetNumberProperty(props, SDL_PROP_TEXTURE_ACCESS_NUMBER, -1);
|
||||
if (access != SDL_TEXTUREACCESS_TARGET) {
|
||||
@@ -190,12 +219,23 @@ namespace backend
|
||||
gl_extensions_initialized = true;
|
||||
}
|
||||
#endif
|
||||
// Compilar el shader y dejarlo listo para usar.
|
||||
|
||||
// Compilar el shader
|
||||
int filesize;
|
||||
char *vshaderfile = mini::file::getfilebuffer(vShaderSource, filesize, true);
|
||||
|
||||
if (!vshaderfile) {
|
||||
can_use_opengl = false;
|
||||
return;
|
||||
}
|
||||
|
||||
char *fshaderfile = nullptr;
|
||||
if (fShaderSource) { fshaderfile = mini::file::getfilebuffer(fShaderSource, filesize, true); }
|
||||
|
||||
programId = compileProgram(vshaderfile, fshaderfile);
|
||||
|
||||
if (vshaderfile) free(vshaderfile);
|
||||
if (fshaderfile) free(fshaderfile);
|
||||
} else {
|
||||
std::cout << "WARNING: El driver del renderer no es OpenGL." << std::endl;
|
||||
can_use_opengl = false;
|
||||
@@ -258,10 +298,16 @@ namespace backend
|
||||
SDL_RenderTexture(backend::video::renderer, backend::video::tex_shader, NULL, &backend::video::dest_rect);
|
||||
SDL_RenderPresent(backend::video::renderer);
|
||||
}
|
||||
if (glGetError()) { printf("GLERROR!\n"); ::exit(1); }
|
||||
checkGLError();
|
||||
//GLenum error = glGetError();
|
||||
//if (error != GL_NO_ERROR) {
|
||||
// printf("GLERROR!\n"); ::exit(1);
|
||||
//}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
@@ -30,6 +30,7 @@ namespace backend
|
||||
if (zoom <= 0) zoom = 1;
|
||||
const SDL_DisplayMode *dm = SDL_GetDesktopDisplayMode(SDL_GetPrimaryDisplay());
|
||||
while ( width * zoom > dm->w || height * zoom > dm->h) zoom--;
|
||||
log_msg(LOG_INFO, "Display size: %ix%i\n", dm->w, dm->h);
|
||||
|
||||
const int z = mini::win::state.fullscreen ? 1 : zoom;
|
||||
// Crear SDL_Window i SDL_Renderer
|
||||
@@ -74,9 +75,14 @@ namespace backend
|
||||
}
|
||||
else
|
||||
{
|
||||
dest_rect.x = dest_rect.y = 0;
|
||||
dest_rect.w = width * zoom;
|
||||
dest_rect.h = height * zoom;
|
||||
if (mini::win::state.console) {
|
||||
dest_rect.x = (ww - dest_rect.w)/2;
|
||||
dest_rect.y = (wh - dest_rect.h)/2;
|
||||
} else {
|
||||
dest_rect.x = dest_rect.y = 0;
|
||||
}
|
||||
printf("dest_rect: (%i,%i)-(%i,%i)\n", (int)dest_rect.x, (int)dest_rect.y, (int)dest_rect.w, (int)dest_rect.h);
|
||||
}
|
||||
shader::reinit();
|
||||
|
||||
Reference in new issue
Block a user