RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 22:47:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix conflicts.

Browse source
This commit is contained in:
Sacha 2014-07-12 17:02:39 +10:00
parent c09b0f511e
commit 9816ec3aa0
35 changed files with 99 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/GS/GL/GLProgram.cpp
View file

@ -51,8 +51,7 @@ void GLProgram::Create(const u32 vp, const u32 fp)
if (bufLength)
{
char* buf = new char[bufLength+1];
memset(buf, 0, bufLength+1);
char* buf = new char[bufLength+1]();
glGetProgramInfoLog(id, bufLength, NULL, buf);
LOG_ERROR(RSX, "Could not link program: %s", buf);
delete[] buf;
@ -70,8 +69,7 @@ void GLProgram::Create(const u32 vp, const u32 fp)
if (bufLength)
{
char* buf = new char[bufLength];
memset(buf, 0, bufLength);
char* buf = new char[bufLength]();
glGetProgramInfoLog(id, bufLength, NULL, buf);
LOG_ERROR(RSX, "Could not link program: %s", buf);
delete[] buf;