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
ddb785c2
Commit
ddb785c2
authored
Jul 08, 2013
by
Shannon Woods
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes a typo in the spelling of GetTextureFormat.
TRAC #23273 Authored-by: Shannon Woods Signed-off-by: Geoff Lang Signed-off-by: Nicolas Capens
parent
94c3f42d
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
7 deletions
+7
-7
Image9.cpp
src/libGLESv2/renderer/Image9.cpp
+1
-1
Renderer9.cpp
src/libGLESv2/renderer/Renderer9.cpp
+1
-1
SwapChain9.cpp
src/libGLESv2/renderer/SwapChain9.cpp
+1
-1
TextureStorage9.cpp
src/libGLESv2/renderer/TextureStorage9.cpp
+2
-2
formatutils9.cpp
src/libGLESv2/renderer/formatutils9.cpp
+1
-1
formatutils9.h
src/libGLESv2/renderer/formatutils9.h
+1
-1
No files found.
src/libGLESv2/renderer/Image9.cpp
View file @
ddb785c2
...
@@ -149,7 +149,7 @@ bool Image9::redefine(rx::Renderer *renderer, GLenum target, GLint internalforma
...
@@ -149,7 +149,7 @@ bool Image9::redefine(rx::Renderer *renderer, GLenum target, GLint internalforma
mInternalFormat
=
internalformat
;
mInternalFormat
=
internalformat
;
// compute the d3d format that will be used
// compute the d3d format that will be used
mD3DFormat
=
gl_d3d9
::
GetTexureFormat
(
internalformat
,
mRenderer
);
mD3DFormat
=
gl_d3d9
::
GetTex
t
ureFormat
(
internalformat
,
mRenderer
);
mActualFormat
=
d3d9_gl
::
GetInternalFormat
(
mD3DFormat
);
mActualFormat
=
d3d9_gl
::
GetInternalFormat
(
mD3DFormat
);
mRenderable
=
gl_d3d9
::
GetRenderFormat
(
internalformat
,
mRenderer
)
!=
D3DFMT_UNKNOWN
;
mRenderable
=
gl_d3d9
::
GetRenderFormat
(
internalformat
,
mRenderer
)
!=
D3DFMT_UNKNOWN
;
...
...
src/libGLESv2/renderer/Renderer9.cpp
View file @
ddb785c2
...
@@ -2450,7 +2450,7 @@ int Renderer9::getMaxSupportedSamples() const
...
@@ -2450,7 +2450,7 @@ int Renderer9::getMaxSupportedSamples() const
GLsizei
Renderer9
::
getMaxSupportedFormatSamples
(
GLint
internalFormat
)
const
GLsizei
Renderer9
::
getMaxSupportedFormatSamples
(
GLint
internalFormat
)
const
{
{
D3DFORMAT
format
=
gl_d3d9
::
GetTexureFormat
(
internalFormat
,
this
);
D3DFORMAT
format
=
gl_d3d9
::
GetTex
t
ureFormat
(
internalFormat
,
this
);
MultisampleSupportMap
::
const_iterator
itr
=
mMultiSampleSupport
.
find
(
format
);
MultisampleSupportMap
::
const_iterator
itr
=
mMultiSampleSupport
.
find
(
format
);
return
(
itr
!=
mMultiSampleSupport
.
end
())
?
mMaxSupportedSamples
:
0
;
return
(
itr
!=
mMultiSampleSupport
.
end
())
?
mMaxSupportedSamples
:
0
;
}
}
...
...
src/libGLESv2/renderer/SwapChain9.cpp
View file @
ddb785c2
...
@@ -139,7 +139,7 @@ EGLint SwapChain9::reset(int backbufferWidth, int backbufferHeight, EGLint swapI
...
@@ -139,7 +139,7 @@ EGLint SwapChain9::reset(int backbufferWidth, int backbufferHeight, EGLint swapI
}
}
result
=
device
->
CreateTexture
(
backbufferWidth
,
backbufferHeight
,
1
,
D3DUSAGE_RENDERTARGET
,
result
=
device
->
CreateTexture
(
backbufferWidth
,
backbufferHeight
,
1
,
D3DUSAGE_RENDERTARGET
,
gl_d3d9
::
GetTexureFormat
(
mBackBufferFormat
,
mRenderer
),
gl_d3d9
::
GetTex
t
ureFormat
(
mBackBufferFormat
,
mRenderer
),
D3DPOOL_DEFAULT
,
&
mOffscreenTexture
,
pShareHandle
);
D3DPOOL_DEFAULT
,
&
mOffscreenTexture
,
pShareHandle
);
if
(
FAILED
(
result
))
if
(
FAILED
(
result
))
{
{
...
...
src/libGLESv2/renderer/TextureStorage9.cpp
View file @
ddb785c2
...
@@ -109,7 +109,7 @@ TextureStorage9_2D::TextureStorage9_2D(Renderer *renderer, int levels, GLenum in
...
@@ -109,7 +109,7 @@ TextureStorage9_2D::TextureStorage9_2D(Renderer *renderer, int levels, GLenum in
if
(
width
>
0
&&
height
>
0
)
if
(
width
>
0
&&
height
>
0
)
{
{
IDirect3DDevice9
*
device
=
mRenderer
->
getDevice
();
IDirect3DDevice9
*
device
=
mRenderer
->
getDevice
();
D3DFORMAT
format
=
gl_d3d9
::
GetTexureFormat
(
internalformat
,
mRenderer
);
D3DFORMAT
format
=
gl_d3d9
::
GetTex
t
ureFormat
(
internalformat
,
mRenderer
);
d3d9
::
MakeValidSize
(
false
,
format
,
&
width
,
&
height
,
&
mLodOffset
);
d3d9
::
MakeValidSize
(
false
,
format
,
&
width
,
&
height
,
&
mLodOffset
);
HRESULT
result
=
device
->
CreateTexture
(
width
,
height
,
levels
?
levels
+
mLodOffset
:
0
,
getUsage
(),
HRESULT
result
=
device
->
CreateTexture
(
width
,
height
,
levels
?
levels
+
mLodOffset
:
0
,
getUsage
(),
format
,
getPool
(),
&
mTexture
,
NULL
);
format
,
getPool
(),
&
mTexture
,
NULL
);
...
@@ -212,7 +212,7 @@ TextureStorage9_Cube::TextureStorage9_Cube(Renderer *renderer, int levels, GLenu
...
@@ -212,7 +212,7 @@ TextureStorage9_Cube::TextureStorage9_Cube(Renderer *renderer, int levels, GLenu
{
{
IDirect3DDevice9
*
device
=
mRenderer
->
getDevice
();
IDirect3DDevice9
*
device
=
mRenderer
->
getDevice
();
int
height
=
size
;
int
height
=
size
;
D3DFORMAT
format
=
gl_d3d9
::
GetTexureFormat
(
internalformat
,
mRenderer
);
D3DFORMAT
format
=
gl_d3d9
::
GetTex
t
ureFormat
(
internalformat
,
mRenderer
);
d3d9
::
MakeValidSize
(
false
,
format
,
&
size
,
&
height
,
&
mLodOffset
);
d3d9
::
MakeValidSize
(
false
,
format
,
&
size
,
&
height
,
&
mLodOffset
);
HRESULT
result
=
device
->
CreateCubeTexture
(
size
,
levels
?
levels
+
mLodOffset
:
0
,
getUsage
(),
HRESULT
result
=
device
->
CreateCubeTexture
(
size
,
levels
?
levels
+
mLodOffset
:
0
,
getUsage
(),
format
,
getPool
(),
&
mTexture
,
NULL
);
format
,
getPool
(),
&
mTexture
,
NULL
);
...
...
src/libGLESv2/renderer/formatutils9.cpp
View file @
ddb785c2
...
@@ -429,7 +429,7 @@ ColorCopyFunction GetFastCopyFunction(D3DFORMAT sourceFormat, GLenum destFormat,
...
@@ -429,7 +429,7 @@ ColorCopyFunction GetFastCopyFunction(D3DFORMAT sourceFormat, GLenum destFormat,
namespace
gl_d3d9
namespace
gl_d3d9
{
{
D3DFORMAT
GetTexureFormat
(
GLint
internalFormat
,
const
Renderer9
*
renderer
)
D3DFORMAT
GetTex
t
ureFormat
(
GLint
internalFormat
,
const
Renderer9
*
renderer
)
{
{
if
(
!
renderer
)
if
(
!
renderer
)
{
{
...
...
src/libGLESv2/renderer/formatutils9.h
View file @
ddb785c2
...
@@ -42,7 +42,7 @@ ColorCopyFunction GetFastCopyFunction(D3DFORMAT sourceFormat, GLenum destFormat,
...
@@ -42,7 +42,7 @@ ColorCopyFunction GetFastCopyFunction(D3DFORMAT sourceFormat, GLenum destFormat,
namespace
gl_d3d9
namespace
gl_d3d9
{
{
D3DFORMAT
GetTexureFormat
(
GLint
internalFormat
,
const
Renderer9
*
renderer
);
D3DFORMAT
GetTex
t
ureFormat
(
GLint
internalFormat
,
const
Renderer9
*
renderer
);
D3DFORMAT
GetRenderFormat
(
GLint
internalFormat
,
const
Renderer9
*
renderer
);
D3DFORMAT
GetRenderFormat
(
GLint
internalFormat
,
const
Renderer9
*
renderer
);
D3DMULTISAMPLE_TYPE
GetMultisampleType
(
GLsizei
samples
);
D3DMULTISAMPLE_TYPE
GetMultisampleType
(
GLsizei
samples
);
...
...
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