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
5215e1a1
Commit
5215e1a1
authored
Jul 26, 2013
by
Jamie Madill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement the API entry points for fence sync objects in GLES 3.
TRAC #23446 Signed-off-by: Geoff Lang Signed-off-by: Shannon Woods Authored-by: Jamie Madill
parent
cd055f81
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
16 deletions
+75
-16
Context.cpp
src/libGLESv2/Context.cpp
+2
-2
libGLESv2.cpp
src/libGLESv2/libGLESv2.cpp
+73
-14
No files found.
src/libGLESv2/Context.cpp
View file @
5215e1a1
...
@@ -1915,8 +1915,8 @@ bool Context::getInteger64v(GLenum pname, GLint64 *params)
...
@@ -1915,8 +1915,8 @@ bool Context::getInteger64v(GLenum pname, GLint64 *params)
}
}
break
;
break
;
case
GL_MAX_SERVER_WAIT_TIMEOUT
:
case
GL_MAX_SERVER_WAIT_TIMEOUT
:
//
Can return an arbitrary value (nanoseconds) as we do not perform any blocking, in this case 100 seconds
.
//
We do not wait for server fence objects internally, so report a max timeout of zero
.
*
params
=
100ll
*
1000ll
*
1000ll
;
*
params
=
0
;
break
;
break
;
default
:
default
:
return
false
;
return
false
;
...
...
src/libGLESv2/libGLESv2.cpp
View file @
5215e1a1
...
@@ -10877,11 +10877,20 @@ GLsync __stdcall glFenceSync(GLenum condition, GLbitfield flags)
...
@@ -10877,11 +10877,20 @@ GLsync __stdcall glFenceSync(GLenum condition, GLbitfield flags)
{
{
if
(
context
->
getClientVersion
()
<
3
)
if
(
context
->
getClientVersion
()
<
3
)
{
{
return
gl
::
error
(
GL_INVALID_OPERATION
,
reinterpret_cast
<
GLsync
>
(
NULL
));
return
gl
::
error
(
GL_INVALID_OPERATION
,
reinterpret_cast
<
GLsync
>
(
0
));
}
}
// glFenceSync
if
(
condition
!=
GL_SYNC_GPU_COMMANDS_COMPLETE
)
UNIMPLEMENTED
();
{
return
gl
::
error
(
GL_INVALID_ENUM
,
reinterpret_cast
<
GLsync
>
(
0
));
}
if
(
flags
!=
0
)
{
return
gl
::
error
(
GL_INVALID_VALUE
,
reinterpret_cast
<
GLsync
>
(
0
));
}
return
context
->
createFenceSync
(
condition
);
}
}
}
}
catch
(
std
::
bad_alloc
&
)
catch
(
std
::
bad_alloc
&
)
...
@@ -10907,8 +10916,7 @@ GLboolean __stdcall glIsSync(GLsync sync)
...
@@ -10907,8 +10916,7 @@ GLboolean __stdcall glIsSync(GLsync sync)
return
gl
::
error
(
GL_INVALID_OPERATION
,
GL_FALSE
);
return
gl
::
error
(
GL_INVALID_OPERATION
,
GL_FALSE
);
}
}
// glIsSync
return
(
context
->
getFenceSync
(
sync
)
!=
NULL
);
UNIMPLEMENTED
();
}
}
}
}
catch
(
std
::
bad_alloc
&
)
catch
(
std
::
bad_alloc
&
)
...
@@ -10934,8 +10942,12 @@ void __stdcall glDeleteSync(GLsync sync)
...
@@ -10934,8 +10942,12 @@ void __stdcall glDeleteSync(GLsync sync)
return
gl
::
error
(
GL_INVALID_OPERATION
);
return
gl
::
error
(
GL_INVALID_OPERATION
);
}
}
// glDeleteSync
if
(
sync
!=
static_cast
<
GLsync
>
(
0
)
&&
!
context
->
getFenceSync
(
sync
))
UNIMPLEMENTED
();
{
return
gl
::
error
(
GL_INVALID_VALUE
);
}
context
->
deleteFenceSync
(
sync
);
}
}
}
}
catch
(
std
::
bad_alloc
&
)
catch
(
std
::
bad_alloc
&
)
...
@@ -10957,11 +10969,22 @@ GLenum __stdcall glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeou
...
@@ -10957,11 +10969,22 @@ GLenum __stdcall glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeou
{
{
if
(
context
->
getClientVersion
()
<
3
)
if
(
context
->
getClientVersion
()
<
3
)
{
{
return
gl
::
error
(
GL_INVALID_OPERATION
,
GL_
FALSE
);
return
gl
::
error
(
GL_INVALID_OPERATION
,
GL_
WAIT_FAILED
);
}
}
// glClientWaitSync
if
((
flags
&
~
(
GL_SYNC_FLUSH_COMMANDS_BIT
))
!=
0
)
UNIMPLEMENTED
();
{
return
gl
::
error
(
GL_INVALID_VALUE
,
GL_WAIT_FAILED
);
}
gl
::
FenceSync
*
fenceSync
=
context
->
getFenceSync
(
sync
);
if
(
!
fenceSync
)
{
return
gl
::
error
(
GL_INVALID_VALUE
,
GL_WAIT_FAILED
);
}
return
fenceSync
->
clientWait
(
flags
,
timeout
);
}
}
}
}
catch
(
std
::
bad_alloc
&
)
catch
(
std
::
bad_alloc
&
)
...
@@ -10988,8 +11011,24 @@ void __stdcall glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
...
@@ -10988,8 +11011,24 @@ void __stdcall glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
return
gl
::
error
(
GL_INVALID_OPERATION
);
return
gl
::
error
(
GL_INVALID_OPERATION
);
}
}
// glWaitSync
if
(
flags
!=
0
)
UNIMPLEMENTED
();
{
return
gl
::
error
(
GL_INVALID_VALUE
);
}
if
(
timeout
!=
GL_TIMEOUT_IGNORED
)
{
return
gl
::
error
(
GL_INVALID_VALUE
);
}
gl
::
FenceSync
*
fenceSync
=
context
->
getFenceSync
(
sync
);
if
(
!
fenceSync
)
{
return
gl
::
error
(
GL_INVALID_VALUE
);
}
fenceSync
->
serverWait
();
}
}
}
}
catch
(
std
::
bad_alloc
&
)
catch
(
std
::
bad_alloc
&
)
...
@@ -11102,8 +11141,28 @@ void __stdcall glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei*
...
@@ -11102,8 +11141,28 @@ void __stdcall glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei*
return
gl
::
error
(
GL_INVALID_OPERATION
);
return
gl
::
error
(
GL_INVALID_OPERATION
);
}
}
// glGetSynciv
if
(
bufSize
<
0
)
UNIMPLEMENTED
();
{
return
gl
::
error
(
GL_INVALID_VALUE
);
}
gl
::
FenceSync
*
fenceSync
=
context
->
getFenceSync
(
sync
);
if
(
!
fenceSync
)
{
return
gl
::
error
(
GL_INVALID_VALUE
);
}
switch
(
pname
)
{
case
GL_OBJECT_TYPE
:
values
[
0
]
=
static_cast
<
GLint
>
(
GL_SYNC_FENCE
);
break
;
case
GL_SYNC_STATUS
:
values
[
0
]
=
static_cast
<
GLint
>
(
fenceSync
->
getStatus
());
break
;
case
GL_SYNC_CONDITION
:
values
[
0
]
=
static_cast
<
GLint
>
(
fenceSync
->
getCondition
());
break
;
case
GL_SYNC_FLAGS
:
values
[
0
]
=
0
;
break
;
default
:
return
gl
::
error
(
GL_INVALID_ENUM
);
}
}
}
}
}
catch
(
std
::
bad_alloc
&
)
catch
(
std
::
bad_alloc
&
)
...
...
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