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
74fe3199
Commit
74fe3199
authored
Jul 24, 2013
by
Shannon Woods
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix handling of null displays in eglMakeCurrent
TRAC #23577 Author: Shannon Woods Signed-off-by: Jamie Madill Signed-off-by: Geoff Lang
parent
e2be248f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
version.h
src/common/version.h
+1
-1
libEGL.cpp
src/libEGL/libEGL.cpp
+12
-8
No files found.
src/common/version.h
View file @
74fe3199
#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 225
3
#define BUILD_REVISION 225
4
#define STRINGIFY(x) #x
#define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x)
#define MACRO_STRINGIFY(x) STRINGIFY(x)
...
...
src/libEGL/libEGL.cpp
View file @
74fe3199
...
@@ -877,17 +877,21 @@ EGLBoolean __stdcall eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface
...
@@ -877,17 +877,21 @@ EGLBoolean __stdcall eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface
{
{
egl
::
Display
*
display
=
static_cast
<
egl
::
Display
*>
(
dpy
);
egl
::
Display
*
display
=
static_cast
<
egl
::
Display
*>
(
dpy
);
gl
::
Context
*
context
=
static_cast
<
gl
::
Context
*>
(
ctx
);
gl
::
Context
*
context
=
static_cast
<
gl
::
Context
*>
(
ctx
);
IDirect3DDevice9
*
device
=
display
->
getDevice
();
if
(
!
device
||
display
->
testDeviceLost
()
)
if
(
display
!=
EGL_NO_DISPLAY
)
{
{
display
->
notifyDeviceLost
();
IDirect3DDevice9
*
device
=
display
->
getDevice
();
return
EGL_FALSE
;
}
if
(
display
->
isDeviceLost
())
if
(
!
device
||
display
->
testDeviceLost
())
{
{
return
error
(
EGL_CONTEXT_LOST
,
EGL_FALSE
);
display
->
notifyDeviceLost
();
return
EGL_FALSE
;
}
if
(
display
->
isDeviceLost
())
{
return
error
(
EGL_CONTEXT_LOST
,
EGL_FALSE
);
}
}
}
if
(
ctx
!=
EGL_NO_CONTEXT
&&
!
validateContext
(
display
,
context
))
if
(
ctx
!=
EGL_NO_CONTEXT
&&
!
validateContext
(
display
,
context
))
...
...
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