valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Some fixes to 4319 by jmarsh.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4321
This commit is contained in:
Peter Veenstra 2020-02-12 16:18:05 +00:00
parent c91f46905b
commit c765582c3e
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gui/render.cpp
View file

@ -22,6 +22,7 @@
#include <math.h>
#include <fstream>
#include <sstream>
#include <stdlib.h>
#include "dosbox.h"
#include "video.h"

18
src/gui/sdlmain.cpp
View file

@ -704,9 +704,12 @@ static GLuint BuildShader ( GLenum type, const char *shaderSrc ) {
if (infoLen>1) {
char* infoLog = (char*)malloc(infoLen);
glGetShaderInfoLog(shader, infoLen, NULL, infoLog);
LOG_MSG("Error compiling shader: %s", infoLog);
free(infoLog);
if (infoLog==NULL) LOG_MSG("Error getting shader compilation log");
else {
glGetShaderInfoLog(shader, infoLen, NULL, infoLog);
LOG_MSG("Error compiling shader: %s", infoLog);
free(infoLog);
}
}
glDeleteShader(shader);
@ -968,9 +971,12 @@ dosurface:
glGetProgramiv(sdl.opengl.program_object, GL_INFO_LOG_LENGTH, &infoLen);
if (infoLen>1) {
char *infoLog = (char*)malloc(infoLen);
glGetProgramInfoLog(sdl.opengl.program_object, infoLen, NULL, infoLog);
LOG_MSG("SDL:OPENGL:Error link prograram:\n %s", infoLog);
free(infoLog);
if (infoLog==NULL) LOG_MSG("SDL:OPENGL:Failed to retrieve program link log");
else {
glGetProgramInfoLog(sdl.opengl.program_object, infoLen, NULL, infoLog);
LOG_MSG("SDL:OPENGL:Error linking program:\n %s", infoLog);
free(infoLog);
}
}
glDeleteProgram(sdl.opengl.program_object);