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
8736bd6b
Commit
8736bd6b
authored
Apr 13, 2013
by
shannon.woods%transgaming.com@gtempaccount.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed build failure.
git-svn-id:
https://angleproject.googlecode.com/svn/branches/es3proto@2108
736b8ea6-26fd-11df-bfd4-992fa37f6226
parent
8bce3f59
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
10 deletions
+7
-10
libGLESv2.cpp
src/libGLESv2/libGLESv2.cpp
+7
-10
No files found.
src/libGLESv2/libGLESv2.cpp
View file @
8736bd6b
...
...
@@ -4249,7 +4249,6 @@ void __stdcall glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
case
GL_VERTEX_ATTRIB_ARRAY_DIVISOR
:
// Don't verify ES3 context because GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE uses
// the same constant.
META_ASSERT
(
GL_VERTEX_ATTRIB_ARRAY_DIVISOR
==
GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE
);
*
params
=
(
GLfloat
)
attribState
.
mDivisor
;
break
;
default
:
return
gl
::
error
(
GL_INVALID_ENUM
);
...
...
@@ -9072,6 +9071,11 @@ void __stdcall glVertexAttribDivisor(GLuint index, GLuint divisor)
try
{
if
(
index
>=
gl
::
MAX_VERTEX_ATTRIBS
)
{
return
gl
::
error
(
GL_INVALID_VALUE
);
}
gl
::
Context
*
context
=
gl
::
getNonLostContext
();
if
(
context
)
...
...
@@ -9080,9 +9084,9 @@ void __stdcall glVertexAttribDivisor(GLuint index, GLuint divisor)
{
return
gl
::
error
(
GL_INVALID_OPERATION
);
}
}
UNIMPLEMENTED
();
context
->
setVertexAttribDivisor
(
index
,
divisor
);
}
}
catch
(
std
::
bad_alloc
&
)
{
...
...
@@ -9395,11 +9399,6 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform
try
{
if
(
index
>=
gl
::
MAX_VERTEX_ATTRIBS
)
{
return
gl
::
error
(
GL_INVALID_VALUE
);
}
gl
::
Context
*
context
=
gl
::
getNonLostContext
();
if
(
context
)
...
...
@@ -9408,8 +9407,6 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform
{
return
gl
::
error
(
GL_INVALID_OPERATION
);
}
context
->
setVertexAttribDivisor
(
index
,
divisor
);
}
}
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