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
01c21d28
Commit
01c21d28
authored
Sep 24, 2013
by
Geoff Lang
Committed by
Geoff Lang
Oct 09, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incorrect targets for TexStorage2D with cube maps.
TRAC #23913 Signed-off-by: Jamie Madill Signed-off-by: Shannon Woods
parent
d0f8e82b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
20 deletions
+5
-20
libGLESv2.cpp
src/libGLESv2/libGLESv2.cpp
+4
-14
validationES3.cpp
src/libGLESv2/validationES3.cpp
+1
-6
No files found.
src/libGLESv2/libGLESv2.cpp
View file @
01c21d28
...
...
@@ -5302,12 +5302,7 @@ void __stdcall glTexStorage2DEXT(GLenum target, GLsizei levels, GLenum internalf
}
break
;
case
GL_TEXTURE_CUBE_MAP_POSITIVE_X
:
case
GL_TEXTURE_CUBE_MAP_NEGATIVE_X
:
case
GL_TEXTURE_CUBE_MAP_POSITIVE_Y
:
case
GL_TEXTURE_CUBE_MAP_NEGATIVE_Y
:
case
GL_TEXTURE_CUBE_MAP_POSITIVE_Z
:
case
GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
:
case
GL_TEXTURE_CUBE_MAP
:
{
gl
::
TextureCubeMap
*
textureCube
=
context
->
getTextureCubeMap
();
textureCube
->
storage
(
levels
,
internalformat
,
width
);
...
...
@@ -5375,7 +5370,7 @@ void __stdcall glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint
break
;
default
:
return
gl
::
error
(
GL_INVALID_ENUM
);
UNREACHABLE
(
);
}
}
}
...
...
@@ -10041,12 +10036,7 @@ void __stdcall glTexStorage2D(GLenum target, GLsizei levels, GLenum internalform
}
break
;
case
GL_TEXTURE_CUBE_MAP_POSITIVE_X
:
case
GL_TEXTURE_CUBE_MAP_NEGATIVE_X
:
case
GL_TEXTURE_CUBE_MAP_POSITIVE_Y
:
case
GL_TEXTURE_CUBE_MAP_NEGATIVE_Y
:
case
GL_TEXTURE_CUBE_MAP_POSITIVE_Z
:
case
GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
:
case
GL_TEXTURE_CUBE_MAP
:
{
gl
::
TextureCubeMap
*
textureCube
=
context
->
getTextureCubeMap
();
textureCube
->
storage
(
levels
,
internalformat
,
width
);
...
...
@@ -10103,7 +10093,7 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform
break
;
default
:
return
gl
::
error
(
GL_INVALID_ENUM
);
UNREACHABLE
(
);
}
}
}
...
...
src/libGLESv2/validationES3.cpp
View file @
01c21d28
...
...
@@ -470,12 +470,7 @@ bool ValidateES3TexStorageParameters(gl::Context *context, GLenum target, GLsize
}
break
;
case
GL_TEXTURE_CUBE_MAP_POSITIVE_X
:
case
GL_TEXTURE_CUBE_MAP_NEGATIVE_X
:
case
GL_TEXTURE_CUBE_MAP_POSITIVE_Y
:
case
GL_TEXTURE_CUBE_MAP_NEGATIVE_Y
:
case
GL_TEXTURE_CUBE_MAP_POSITIVE_Z
:
case
GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
:
case
GL_TEXTURE_CUBE_MAP
:
{
texture
=
context
->
getTextureCubeMap
();
...
...
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