Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
swiftshader
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
swiftshader
Commits
ae799b19
Commit
ae799b19
authored
May 13, 2014
by
Nicolas Capens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement GL_EXT_blend_minmax support
BUG=14852910 Change-Id: I0ade7db0284370d91fbb3c35c8ca6ed040bdba1e
parent
499b440c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
Context.cpp
src/GLES2/libGLESv2/Context.cpp
+1
-1
libGLESv2.cpp
src/GLES2/libGLESv2/libGLESv2.cpp
+4
-0
utilities.cpp
src/GLES2/libGLESv2/utilities.cpp
+2
-0
No files found.
src/GLES2/libGLESv2/Context.cpp
View file @
ae799b19
...
@@ -497,7 +497,6 @@ void Context::setPolygonOffsetFill(bool enabled)
...
@@ -497,7 +497,6 @@ void Context::setPolygonOffsetFill(bool enabled)
bool
Context
::
isPolygonOffsetFillEnabled
()
const
bool
Context
::
isPolygonOffsetFillEnabled
()
const
{
{
return
mState
.
polygonOffsetFill
;
return
mState
.
polygonOffsetFill
;
}
}
void
Context
::
setPolygonOffsetParams
(
GLfloat
factor
,
GLfloat
units
)
void
Context
::
setPolygonOffsetParams
(
GLfloat
factor
,
GLfloat
units
)
...
@@ -2743,6 +2742,7 @@ void Context::initExtensionString()
...
@@ -2743,6 +2742,7 @@ void Context::initExtensionString()
mExtensionString
+=
"GL_OES_texture_half_float "
;
mExtensionString
+=
"GL_OES_texture_half_float "
;
mExtensionString
+=
"GL_OES_texture_half_float_linear "
;
mExtensionString
+=
"GL_OES_texture_half_float_linear "
;
mExtensionString
+=
"GL_OES_texture_npot "
;
mExtensionString
+=
"GL_OES_texture_npot "
;
mExtensionString
+=
"GL_EXT_blend_minmax "
;
mExtensionString
+=
"GL_EXT_occlusion_query_boolean "
;
mExtensionString
+=
"GL_EXT_occlusion_query_boolean "
;
mExtensionString
+=
"GL_EXT_read_format_bgra "
;
mExtensionString
+=
"GL_EXT_read_format_bgra "
;
...
...
src/GLES2/libGLESv2/libGLESv2.cpp
View file @
ae799b19
...
@@ -428,6 +428,8 @@ void GL_APIENTRY glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
...
@@ -428,6 +428,8 @@ void GL_APIENTRY glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
case
GL_FUNC_ADD
:
case
GL_FUNC_ADD
:
case
GL_FUNC_SUBTRACT
:
case
GL_FUNC_SUBTRACT
:
case
GL_FUNC_REVERSE_SUBTRACT
:
case
GL_FUNC_REVERSE_SUBTRACT
:
case
GL_MIN_EXT
:
case
GL_MAX_EXT
:
break
;
break
;
default
:
default
:
return
error
(
GL_INVALID_ENUM
);
return
error
(
GL_INVALID_ENUM
);
...
@@ -438,6 +440,8 @@ void GL_APIENTRY glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
...
@@ -438,6 +440,8 @@ void GL_APIENTRY glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
case
GL_FUNC_ADD
:
case
GL_FUNC_ADD
:
case
GL_FUNC_SUBTRACT
:
case
GL_FUNC_SUBTRACT
:
case
GL_FUNC_REVERSE_SUBTRACT
:
case
GL_FUNC_REVERSE_SUBTRACT
:
case
GL_MIN_EXT
:
case
GL_MAX_EXT
:
break
;
break
;
default
:
default
:
return
error
(
GL_INVALID_ENUM
);
return
error
(
GL_INVALID_ENUM
);
...
...
src/GLES2/libGLESv2/utilities.cpp
View file @
ae799b19
...
@@ -512,6 +512,8 @@ namespace es2sw
...
@@ -512,6 +512,8 @@ namespace es2sw
case
GL_FUNC_ADD
:
return
sw
::
Context
::
BLENDOP_ADD
;
case
GL_FUNC_ADD
:
return
sw
::
Context
::
BLENDOP_ADD
;
case
GL_FUNC_SUBTRACT
:
return
sw
::
Context
::
BLENDOP_SUB
;
case
GL_FUNC_SUBTRACT
:
return
sw
::
Context
::
BLENDOP_SUB
;
case
GL_FUNC_REVERSE_SUBTRACT
:
return
sw
::
Context
::
BLENDOP_INVSUB
;
case
GL_FUNC_REVERSE_SUBTRACT
:
return
sw
::
Context
::
BLENDOP_INVSUB
;
case
GL_MIN_EXT
:
return
sw
::
Context
::
BLENDOP_MIN
;
case
GL_MAX_EXT
:
return
sw
::
Context
::
BLENDOP_MAX
;
default
:
UNREACHABLE
();
default
:
UNREACHABLE
();
}
}
...
...
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