Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
angle
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
angle
Commits
807d8c33
Commit
807d8c33
authored
Apr 04, 2012
by
daniel@transgaming.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed info log regressions.
TRAC #20443 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id:
https://angleproject.googlecode.com/svn/trunk@1017
736b8ea6-26fd-11df-bfd4-992fa37f6226
parent
978702d8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
19 deletions
+19
-19
version.h
src/common/version.h
+1
-1
Program.cpp
src/libGLESv2/Program.cpp
+6
-6
Shader.cpp
src/libGLESv2/Shader.cpp
+12
-12
No files found.
src/common/version.h
View file @
807d8c33
#define MAJOR_VERSION 1
#define MAJOR_VERSION 1
#define MINOR_VERSION 0
#define MINOR_VERSION 0
#define BUILD_VERSION 0
#define BUILD_VERSION 0
#define BUILD_REVISION 101
3
#define BUILD_REVISION 101
7
#define STRINGIFY(x) #x
#define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x)
#define MACRO_STRINGIFY(x) STRINGIFY(x)
...
...
src/libGLESv2/Program.cpp
View file @
807d8c33
...
@@ -2454,14 +2454,14 @@ void Program::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog)
...
@@ -2454,14 +2454,14 @@ void Program::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog)
{
{
int
index
=
0
;
int
index
=
0
;
if
(
mInfoLog
)
if
(
bufSize
>
0
)
{
{
index
=
std
::
min
(
bufSize
-
1
,
(
int
)
strlen
(
mInfoLog
));
if
(
mInfoLog
)
memcpy
(
infoLog
,
mInfoLog
,
index
);
{
}
index
=
std
::
min
(
bufSize
-
1
,
(
int
)
strlen
(
mInfoLog
));
memcpy
(
infoLog
,
mInfoLog
,
index
);
}
if
(
bufSize
)
{
infoLog
[
index
]
=
'\0'
;
infoLog
[
index
]
=
'\0'
;
}
}
...
...
src/libGLESv2/Shader.cpp
View file @
807d8c33
...
@@ -102,14 +102,14 @@ void Shader::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog)
...
@@ -102,14 +102,14 @@ void Shader::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog)
{
{
int
index
=
0
;
int
index
=
0
;
if
(
mInfoLog
)
if
(
bufSize
>
0
)
{
{
index
=
std
::
min
(
bufSize
-
1
,
(
int
)
strlen
(
mInfoLog
));
if
(
mInfoLog
)
memcpy
(
infoLog
,
mInfoLog
,
index
);
{
}
index
=
std
::
min
(
bufSize
-
1
,
(
int
)
strlen
(
mInfoLog
));
memcpy
(
infoLog
,
mInfoLog
,
index
);
}
if
(
bufSize
)
{
infoLog
[
index
]
=
'\0'
;
infoLog
[
index
]
=
'\0'
;
}
}
...
@@ -147,14 +147,14 @@ void Shader::getSourceImpl(char *source, GLsizei bufSize, GLsizei *length, char
...
@@ -147,14 +147,14 @@ void Shader::getSourceImpl(char *source, GLsizei bufSize, GLsizei *length, char
{
{
int
index
=
0
;
int
index
=
0
;
if
(
source
)
if
(
bufSize
>
0
)
{
{
index
=
std
::
min
(
bufSize
-
1
,
(
int
)
strlen
(
source
));
if
(
source
)
memcpy
(
buffer
,
source
,
index
);
{
}
index
=
std
::
min
(
bufSize
-
1
,
(
int
)
strlen
(
source
));
memcpy
(
buffer
,
source
,
index
);
}
if
(
bufSize
)
{
buffer
[
index
]
=
'\0'
;
buffer
[
index
]
=
'\0'
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment