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
82b28913
Commit
82b28913
authored
Dec 12, 2011
by
daniel@transgaming.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error reporting for lost contexts
Trac #19246 Issue=262 Signed-off-by: Nicolas Capens git-svn-id:
https://angleproject.googlecode.com/svn/trunk@906
736b8ea6-26fd-11df-bfd4-992fa37f6226
parent
7f4dee14
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
+14
-8
version.h
src/common/version.h
+1
-1
libGLESv2.cpp
src/libGLESv2/libGLESv2.cpp
+1
-4
main.cpp
src/libGLESv2/main.cpp
+12
-3
No files found.
src/common/version.h
View file @
82b28913
#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 90
5
#define BUILD_REVISION 90
6
#define STRINGIFY(x) #x
#define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x)
#define MACRO_STRINGIFY(x) STRINGIFY(x)
...
...
src/libGLESv2/libGLESv2.cpp
View file @
82b28913
...
@@ -2707,10 +2707,7 @@ GLenum __stdcall glGetError(void)
...
@@ -2707,10 +2707,7 @@ GLenum __stdcall glGetError(void)
if
(
context
)
if
(
context
)
{
{
if
(
context
->
isContextLost
())
return
context
->
getError
();
return
GL_OUT_OF_MEMORY
;
else
return
context
->
getError
();
}
}
return
GL_NO_ERROR
;
return
GL_NO_ERROR
;
...
...
src/libGLESv2/main.cpp
View file @
82b28913
...
@@ -98,9 +98,18 @@ Context *getNonLostContext()
...
@@ -98,9 +98,18 @@ Context *getNonLostContext()
{
{
Context
*
context
=
getContext
();
Context
*
context
=
getContext
();
if
(
context
&&
!
context
->
isContextLost
())
if
(
context
)
return
context
;
{
if
(
context
->
isContextLost
())
{
error
(
GL_OUT_OF_MEMORY
);
return
NULL
;
}
else
{
return
context
;
}
}
return
NULL
;
return
NULL
;
}
}
...
...
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