zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Message log cleanup for GPU program compilation and removed a GL error.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1324 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2009-04-14 13:58:38 +00:00
parent 2ac7c2dc1e
commit 5b3524d621
3 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/build/include/polymer.h
View file

@ -135,7 +135,7 @@ typedef struct s_prrograminfo {
GLint uniform_spotRadius; GLint uniform_spotRadius;
} _prprograminfo; } _prprograminfo;
#define PR_INFO_LOG_BUFFER_SIZE 65536 #define PR_INFO_LOG_BUFFER_SIZE 8192
typedef struct s_prprogrambit { typedef struct s_prprogrambit {
int32_t bit; int32_t bit;

4
polymer/eduke32/build/src/osd.c
View file

@ -1413,14 +1413,14 @@ static inline void linefeed(void)
#define MAX_ERRORS 4096 #define MAX_ERRORS 4096
void OSD_Printf(const char *fmt, ...) void OSD_Printf(const char *fmt, ...)
{ {
static char tmpstr[1024]; static char tmpstr[8192];
char *chp, p=osdtextpal, s=osdtextshade; char *chp, p=osdtextpal, s=osdtextshade;
va_list va; va_list va;
if (!osdinited) OSD_Init(); if (!osdinited) OSD_Init();
va_start(va, fmt); va_start(va, fmt);
Bvsnprintf(tmpstr, 1024, fmt, va); Bvsnprintf(tmpstr, 8192, fmt, va);
va_end(va); va_end(va);
if (tmpstr[0]=='^' && tmpstr[1]=='1' && tmpstr[2]=='0' && ++OSD_errors > MAX_ERRORS) if (tmpstr[0]=='^' && tmpstr[1]=='1' && tmpstr[2]=='0' && ++OSD_errors > MAX_ERRORS)

31
polymer/eduke32/build/src/polymer.c
View file

@ -3310,15 +3310,17 @@ static int32_t polymer_bindmaterial(_prmaterial material, char* lights, int
if (programbits & prprogrambits[PR_BIT_ANIM_INTERPOLATION].bit) if (programbits & prprogrambits[PR_BIT_ANIM_INTERPOLATION].bit)
{ {
bglEnableVertexAttribArrayARB(prprograms[programbits].attrib_nextFrameData); bglEnableVertexAttribArrayARB(prprograms[programbits].attrib_nextFrameData);
bglEnableVertexAttribArrayARB(prprograms[programbits].attrib_nextFrameNormal); if (prprograms[programbits].attrib_nextFrameNormal != -1)
bglEnableVertexAttribArrayARB(prprograms[programbits].attrib_nextFrameNormal);
bglVertexAttribPointerARB(prprograms[programbits].attrib_nextFrameData, bglVertexAttribPointerARB(prprograms[programbits].attrib_nextFrameData,
3, GL_FLOAT, GL_FALSE, 3, GL_FLOAT, GL_FALSE,
material.nextframedatastride, material.nextframedatastride,
material.nextframedata); material.nextframedata);
bglVertexAttribPointerARB(prprograms[programbits].attrib_nextFrameNormal, if (prprograms[programbits].attrib_nextFrameNormal != -1)
3, GL_FLOAT, GL_FALSE, bglVertexAttribPointerARB(prprograms[programbits].attrib_nextFrameNormal,
material.nextframedatastride, 3, GL_FLOAT, GL_FALSE,
material.nextframedata + 3); material.nextframedatastride,
material.nextframedata + 3);
bglUniform1fARB(prprograms[programbits].uniform_frameProgress, material.frameprogress); bglUniform1fARB(prprograms[programbits].uniform_frameProgress, material.frameprogress);
} }
@ -3537,7 +3539,8 @@ static void polymer_unbindmaterial(int32_t programbits)
// PR_BIT_ANIM_INTERPOLATION // PR_BIT_ANIM_INTERPOLATION
if (programbits & prprogrambits[PR_BIT_ANIM_INTERPOLATION].bit) if (programbits & prprogrambits[PR_BIT_ANIM_INTERPOLATION].bit)
{ {
bglDisableVertexAttribArrayARB(prprograms[programbits].attrib_nextFrameNormal); if (prprograms[programbits].attrib_nextFrameNormal != -1)
bglDisableVertexAttribArrayARB(prprograms[programbits].attrib_nextFrameNormal);
bglDisableVertexAttribArrayARB(prprograms[programbits].attrib_nextFrameData); bglDisableVertexAttribArrayARB(prprograms[programbits].attrib_nextFrameData);
} }
@ -3557,6 +3560,7 @@ static void polymer_compileprogram(int32_t programbits)
GLhandleARB vert, frag, program; GLhandleARB vert, frag, program;
GLcharARB* source[PR_BIT_COUNT * 2]; GLcharARB* source[PR_BIT_COUNT * 2];
GLcharARB infobuffer[PR_INFO_LOG_BUFFER_SIZE]; GLcharARB infobuffer[PR_INFO_LOG_BUFFER_SIZE];
GLint linkstatus;
// --------- VERTEX // --------- VERTEX
vert = bglCreateShaderObjectARB(GL_VERTEX_SHADER_ARB); vert = bglCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
@ -3610,17 +3614,20 @@ static void polymer_compileprogram(int32_t programbits)
bglLinkProgramARB(program); bglLinkProgramARB(program);
bglGetObjectParameterivARB(program, GL_OBJECT_LINK_STATUS_ARB, &linkstatus);
bglGetInfoLogARB(program, PR_INFO_LOG_BUFFER_SIZE, NULL, infobuffer); bglGetInfoLogARB(program, PR_INFO_LOG_BUFFER_SIZE, NULL, infobuffer);
prprograms[programbits].handle = program; prprograms[programbits].handle = program;
if (pr_verbosity >= 1) OSD_Printf("Compiling GPU program with bits %i...\n", programbits); if (pr_verbosity >= 1) OSD_Printf("PR : Compiling GPU program with bits %i...\n", programbits);
if (infobuffer[0]) { if (!linkstatus) {
if (pr_verbosity >= 1) OSD_Printf("Info log:\n%s\n", infobuffer); OSD_Printf("PR : Failed to compile GPU program with bits %i!\n", programbits);
if (pr_verbosity >= 1) OSD_Printf("PR : Compilation log:\n%s\n", infobuffer);
bglGetShaderSourceARB(vert, PR_INFO_LOG_BUFFER_SIZE, NULL, infobuffer); bglGetShaderSourceARB(vert, PR_INFO_LOG_BUFFER_SIZE, NULL, infobuffer);
if (pr_verbosity >= 1) OSD_Printf("Vertex source dump:\n%s\n", infobuffer); if (pr_verbosity >= 1) OSD_Printf("PR : Vertex source dump:\n%s\n", infobuffer);
bglGetShaderSourceARB(frag, PR_INFO_LOG_BUFFER_SIZE, NULL, infobuffer); bglGetShaderSourceARB(frag, PR_INFO_LOG_BUFFER_SIZE, NULL, infobuffer);
if (pr_verbosity >= 1) OSD_Printf("Shader source dump:\n%s\n", infobuffer); if (pr_verbosity >= 1) OSD_Printf("PR : Fragment source dump:\n%s\n", infobuffer);
} }
// --------- ATTRIBUTE/UNIFORM LOCATIONS // --------- ATTRIBUTE/UNIFORM LOCATIONS
@ -4129,7 +4136,7 @@ static void polymer_initrendertargets(int32_t count)
if (bglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT) != GL_FRAMEBUFFER_COMPLETE_EXT) if (bglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT) != GL_FRAMEBUFFER_COMPLETE_EXT)
{ {
OSD_Printf("FBO #%d initialization failed.\n", i); OSD_Printf("PR : FBO #%d initialization failed.\n", i);
} }
bglBindTexture(prrts[i].target, 0); bglBindTexture(prrts[i].target, 0);