Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Laszlo Agocs
qtrhi
Commits
2c0e4494
Commit
2c0e4494
authored
Nov 21, 2018
by
Laszlo Agocs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "shadertools: Describe some ideas around gl program binaries"
This reverts commit
2676ad23
.
parent
2676ad23
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
23 deletions
+3
-23
src/rhi/qrhigles2.cpp
src/rhi/qrhigles2.cpp
+0
-12
src/shadertools/qbakedshader.h
src/shadertools/qbakedshader.h
+1
-2
todo.txt
todo.txt
+2
-5
tools/qsb/qsb.cpp
tools/qsb/qsb.cpp
+0
-4
No files found.
src/rhi/qrhigles2.cpp
View file @
2c0e4494
...
...
@@ -1401,18 +1401,6 @@ bool QGles2GraphicsPipeline::build()
if
(
!
isVertex
&&
!
isFragment
)
continue
;
if
(
isVertex
)
{
bool
gotProgramBinary
=
false
;
for
(
const
QBakedShader
::
ShaderKey
&
skey
:
shaderStage
.
shader
.
availableShaders
())
{
if
(
skey
.
source
==
QBakedShader
::
OpenGLProgramBinary
)
{
// ###
//gotProgramBinary = true;
}
}
if
(
gotProgramBinary
)
break
;
}
GLuint
shader
=
rhiD
->
f
->
glCreateShader
(
isVertex
?
GL_VERTEX_SHADER
:
GL_FRAGMENT_SHADER
);
QBakedShader
::
ShaderSourceVersion
ver
;
if
(
rhiD
->
ctx
->
isOpenGLES
())
...
...
src/shadertools/qbakedshader.h
View file @
2c0e4494
...
...
@@ -63,8 +63,7 @@ public:
DxbcShader
,
// fxc
MslShader
,
DxilShader
,
// dxc
MetalLibShader
,
// xcrun metal + xcrun metallib
OpenGLProgramBinary
// stage must be vertex, use version for format
MetalLibShader
// xcrun metal + xcrun metallib
};
struct
ShaderSourceVersion
{
...
...
todo.txt
View file @
2c0e4494
...
...
@@ -26,7 +26,6 @@ gl: more ubuf types
gl: reduce state, reduce texparam
gl: tex size stuff (npot etc.)
d3d, gl, mtl: cache shader sources?
gl: program binary load support
advanced blend modes?
resize to 0 width or height fails (vk)
gl: ubuf structs, arrays
...
...
@@ -39,13 +38,11 @@ more tex: 3d, array?
vk: support instanceStepRate via VK_EXT_vertex_attribute_divisor
shadertools:
qsb management (merge, delete)? -> could then do a tool to save gl program binaries on target and then merge them to a qsb on the host
dxc for d3d in addition to fxc
?
bytecode (fxc/dxc) for d3d?
bytecode for metal
?
hlsl -> dxc -> spirv -> spirv-cross hmmm...
+++ done
bytecode (fxc) for d3d
bytecode for metal
vk: im.layout transition missing when no upload, no render to (or is the case invalid?)
vk, d3d: verify no-color-just-depth again
preservecolor applies to which att. (all -> fix mtl)
...
...
tools/qsb/qsb.cpp
View file @
2c0e4494
...
...
@@ -125,8 +125,6 @@ static QString sourceStr(QBakedShader::ShaderSource source)
return
QStringLiteral
(
"DXIL"
);
case
QBakedShader
::
MetalLibShader
:
return
QStringLiteral
(
"metallib"
);
case
QBakedShader
::
OpenGLProgramBinary
:
return
QStringLiteral
(
"glProgramBinary"
);
default:
Q_UNREACHABLE
();
}
...
...
@@ -182,8 +180,6 @@ static void dump(const QBakedShader &bs)
case
QBakedShader
::
DxilShader
:
Q_FALLTHROUGH
();
case
QBakedShader
::
MetalLibShader
:
Q_FALLTHROUGH
();
case
QBakedShader
::
OpenGLProgramBinary
:
ts
<<
"Binary of "
<<
shader
.
shader
.
size
()
<<
" bytes
\n\n
"
;
break
;
default:
...
...
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