Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
swiftshader
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
swiftshader
Commits
49e3cb5f
Commit
49e3cb5f
authored
May 06, 2014
by
Nicolas Capens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix projected texture mapping with lod or bias.
parent
7381c994
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
12 deletions
+9
-12
Version.h
src/Common/Version.h
+1
-1
OutputASM.cpp
src/GLES2/compiler/OutputASM.cpp
+8
-11
No files found.
src/Common/Version.h
View file @
49e3cb5f
#define MAJOR_VERSION 3
#define MAJOR_VERSION 3
#define MINOR_VERSION 2
#define MINOR_VERSION 2
#define BUILD_VERSION 6
#define BUILD_VERSION 6
#define BUILD_REVISION 4
5159
#define BUILD_REVISION 4
7125
#define STRINGIFY(x) #x
#define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x)
#define MACRO_STRINGIFY(x) STRINGIFY(x)
...
...
src/GLES2/compiler/OutputASM.cpp
View file @
49e3cb5f
...
@@ -785,18 +785,17 @@ namespace sh
...
@@ -785,18 +785,17 @@ namespace sh
else
if
(
argumentCount
==
3
)
// bias
else
if
(
argumentCount
==
3
)
// bias
{
{
Temporary
proj
(
this
);
Temporary
proj
(
this
);
emit
(
sw
::
Shader
::
OPCODE_MOV
,
&
proj
,
arg
[
1
]);
if
(
t
->
getNominalSize
()
==
3
)
if
(
t
->
getNominalSize
()
==
3
)
{
{
Instruction
*
div
=
emit
(
sw
::
Shader
::
OPCODE_DIV
,
&
proj
,
&
proj
);
Instruction
*
div
=
emit
(
sw
::
Shader
::
OPCODE_DIV
,
&
proj
,
arg
[
1
],
arg
[
1
]
);
div
->
src
[
0
].
swizzle
=
0xAA
;
div
->
src
[
1
].
swizzle
=
0xAA
;
div
->
dst
.
mask
=
0x3
;
div
->
dst
.
mask
=
0x3
;
}
}
else
if
(
t
->
getNominalSize
()
==
4
)
else
if
(
t
->
getNominalSize
()
==
4
)
{
{
Instruction
*
div
=
emit
(
sw
::
Shader
::
OPCODE_DIV
,
&
proj
,
&
proj
);
Instruction
*
div
=
emit
(
sw
::
Shader
::
OPCODE_DIV
,
&
proj
,
arg
[
1
],
arg
[
1
]
);
div
->
src
[
0
].
swizzle
=
0xFF
;
div
->
src
[
1
].
swizzle
=
0xFF
;
div
->
dst
.
mask
=
0x3
;
div
->
dst
.
mask
=
0x3
;
}
}
else
UNREACHABLE
();
else
UNREACHABLE
();
...
@@ -821,20 +820,18 @@ namespace sh
...
@@ -821,20 +820,18 @@ namespace sh
else
if
(
name
==
"texture2DProjLod"
)
else
if
(
name
==
"texture2DProjLod"
)
{
{
TIntermTyped
*
t
=
arg
[
1
]
->
getAsTyped
();
TIntermTyped
*
t
=
arg
[
1
]
->
getAsTyped
();
Temporary
proj
(
this
);
Temporary
proj
(
this
);
emit
(
sw
::
Shader
::
OPCODE_MOV
,
&
proj
,
arg
[
1
]);
if
(
t
->
getNominalSize
()
==
3
)
if
(
t
->
getNominalSize
()
==
3
)
{
{
Instruction
*
div
=
emit
(
sw
::
Shader
::
OPCODE_DIV
,
&
proj
,
&
proj
);
Instruction
*
div
=
emit
(
sw
::
Shader
::
OPCODE_DIV
,
&
proj
,
arg
[
1
],
arg
[
1
]
);
div
->
src
[
0
].
swizzle
=
0xAA
;
div
->
src
[
1
].
swizzle
=
0xAA
;
div
->
dst
.
mask
=
0x3
;
div
->
dst
.
mask
=
0x3
;
}
}
else
if
(
t
->
getNominalSize
()
==
4
)
else
if
(
t
->
getNominalSize
()
==
4
)
{
{
Instruction
*
div
=
emit
(
sw
::
Shader
::
OPCODE_DIV
,
&
proj
,
&
proj
);
Instruction
*
div
=
emit
(
sw
::
Shader
::
OPCODE_DIV
,
&
proj
,
arg
[
1
],
arg
[
1
]
);
div
->
src
[
0
].
swizzle
=
0xFF
;
div
->
src
[
1
].
swizzle
=
0xFF
;
div
->
dst
.
mask
=
0x3
;
div
->
dst
.
mask
=
0x3
;
}
}
else
UNREACHABLE
();
else
UNREACHABLE
();
...
...
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