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
e918ea2d
Commit
e918ea2d
authored
Nov 12, 2011
by
daniel@transgaming.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename UniformTypeSize to UniformInternalSize
Trac #18608 Signed-off-by: Nicolas Capens git-svn-id:
https://angleproject.googlecode.com/svn/trunk@868
736b8ea6-26fd-11df-bfd4-992fa37f6226
parent
edc31508
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
Program.cpp
src/libGLESv2/Program.cpp
+1
-1
utilities.cpp
src/libGLESv2/utilities.cpp
+1
-1
utilities.h
src/libGLESv2/utilities.h
+1
-1
No files found.
src/libGLESv2/Program.cpp
View file @
e918ea2d
...
@@ -36,7 +36,7 @@ std::string str(int i)
...
@@ -36,7 +36,7 @@ std::string str(int i)
Uniform
::
Uniform
(
GLenum
type
,
const
std
::
string
&
_name
,
unsigned
int
arraySize
)
Uniform
::
Uniform
(
GLenum
type
,
const
std
::
string
&
_name
,
unsigned
int
arraySize
)
:
type
(
type
),
_name
(
_name
),
name
(
Program
::
undecorateUniform
(
_name
)),
arraySize
(
arraySize
)
:
type
(
type
),
_name
(
_name
),
name
(
Program
::
undecorateUniform
(
_name
)),
arraySize
(
arraySize
)
{
{
int
bytes
=
Uniform
Type
Size
(
type
)
*
arraySize
;
int
bytes
=
Uniform
Internal
Size
(
type
)
*
arraySize
;
data
=
new
unsigned
char
[
bytes
];
data
=
new
unsigned
char
[
bytes
];
memset
(
data
,
0
,
bytes
);
memset
(
data
,
0
,
bytes
);
dirty
=
true
;
dirty
=
true
;
...
...
src/libGLESv2/utilities.cpp
View file @
e918ea2d
...
@@ -135,7 +135,7 @@ size_t UniformComponentSize(GLenum type)
...
@@ -135,7 +135,7 @@ size_t UniformComponentSize(GLenum type)
return
0
;
return
0
;
}
}
size_t
Uniform
Type
Size
(
GLenum
type
)
size_t
Uniform
Internal
Size
(
GLenum
type
)
{
{
return
UniformComponentSize
(
UniformComponentType
(
type
))
*
UniformInternalComponentCount
(
type
);
return
UniformComponentSize
(
UniformComponentType
(
type
))
*
UniformInternalComponentCount
(
type
);
}
}
...
...
src/libGLESv2/utilities.h
View file @
e918ea2d
...
@@ -24,7 +24,7 @@ struct Color;
...
@@ -24,7 +24,7 @@ struct Color;
int
UniformExternalComponentCount
(
GLenum
type
);
int
UniformExternalComponentCount
(
GLenum
type
);
int
UniformInternalComponentCount
(
GLenum
type
);
int
UniformInternalComponentCount
(
GLenum
type
);
GLenum
UniformComponentType
(
GLenum
type
);
GLenum
UniformComponentType
(
GLenum
type
);
size_t
Uniform
Type
Size
(
GLenum
type
);
size_t
Uniform
Internal
Size
(
GLenum
type
);
int
VariableRowCount
(
GLenum
type
);
int
VariableRowCount
(
GLenum
type
);
int
VariableColumnCount
(
GLenum
type
);
int
VariableColumnCount
(
GLenum
type
);
...
...
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