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
5ab33c89
Commit
5ab33c89
authored
Jun 26, 2013
by
Shannon Woods
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes tabs-vs-spaces that have crept into the project.
TRAC #23251 Authored-by: Shannon Woods Signed-off-by: Jamie Madill Signed-off-by: Nicolas Capens
parent
193dc48b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
18 deletions
+18
-18
Renderer11.cpp
src/libGLESv2/renderer/Renderer11.cpp
+18
-18
No files found.
src/libGLESv2/renderer/Renderer11.cpp
View file @
5ab33c89
...
...
@@ -859,7 +859,7 @@ bool Renderer11::applyPrimitiveType(GLenum mode, GLsizei count)
case
GL_TRIANGLES
:
primitiveTopology
=
D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST
;
break
;
case
GL_TRIANGLE_STRIP
:
primitiveTopology
=
D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP
;
break
;
// emulate fans via rewriting index buffer
case
GL_TRIANGLE_FAN
:
primitiveTopology
=
D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST
;
break
;
case
GL_TRIANGLE_FAN
:
primitiveTopology
=
D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST
;
break
;
default
:
return
gl
::
error
(
GL_INVALID_ENUM
,
false
);
}
...
...
@@ -1399,21 +1399,21 @@ void Renderer11::applyUniforms(gl::ProgramBinary *programBinary, gl::UniformArra
float
(
*
mapVS
)[
4
]
=
NULL
;
float
(
*
mapPS
)[
4
]
=
NULL
;
if
(
totalRegisterCountVS
>
0
&&
vertexUniformsDirty
)
{
D3D11_MAPPED_SUBRESOURCE
map
=
{
0
};
HRESULT
result
=
mDeviceContext
->
Map
(
vertexConstantBuffer
,
0
,
D3D11_MAP_WRITE_DISCARD
,
0
,
&
map
);
ASSERT
(
SUCCEEDED
(
result
));
mapVS
=
(
float
(
*
)[
4
])
map
.
pData
;
}
if
(
totalRegisterCountPS
>
0
&&
pixelUniformsDirty
)
{
D3D11_MAPPED_SUBRESOURCE
map
=
{
0
};
HRESULT
result
=
mDeviceContext
->
Map
(
pixelConstantBuffer
,
0
,
D3D11_MAP_WRITE_DISCARD
,
0
,
&
map
);
ASSERT
(
SUCCEEDED
(
result
));
mapPS
=
(
float
(
*
)[
4
])
map
.
pData
;
}
if
(
totalRegisterCountVS
>
0
&&
vertexUniformsDirty
)
{
D3D11_MAPPED_SUBRESOURCE
map
=
{
0
};
HRESULT
result
=
mDeviceContext
->
Map
(
vertexConstantBuffer
,
0
,
D3D11_MAP_WRITE_DISCARD
,
0
,
&
map
);
ASSERT
(
SUCCEEDED
(
result
));
mapVS
=
(
float
(
*
)[
4
])
map
.
pData
;
}
if
(
totalRegisterCountPS
>
0
&&
pixelUniformsDirty
)
{
D3D11_MAPPED_SUBRESOURCE
map
=
{
0
};
HRESULT
result
=
mDeviceContext
->
Map
(
pixelConstantBuffer
,
0
,
D3D11_MAP_WRITE_DISCARD
,
0
,
&
map
);
ASSERT
(
SUCCEEDED
(
result
));
mapPS
=
(
float
(
*
)[
4
])
map
.
pData
;
}
for
(
gl
::
UniformArray
::
iterator
uniform_iterator
=
uniformArray
->
begin
();
uniform_iterator
!=
uniformArray
->
end
();
uniform_iterator
++
)
{
...
...
@@ -2145,12 +2145,12 @@ unsigned int Renderer11::getMaxCombinedTextureImageUnits() const
unsigned
int
Renderer11
::
getReservedVertexUniformVectors
()
const
{
return
0
;
// Driver uniforms are stored in a separate constant buffer
return
0
;
// Driver uniforms are stored in a separate constant buffer
}
unsigned
int
Renderer11
::
getReservedFragmentUniformVectors
()
const
{
return
0
;
// Driver uniforms are stored in a separate constant buffer
return
0
;
// Driver uniforms are stored in a separate constant buffer
}
unsigned
int
Renderer11
::
getMaxVertexUniformVectors
()
const
...
...
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