Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Laszlo Agocs
qtrhi
Commits
2f4c4b7a
Commit
2f4c4b7a
authored
Mar 16, 2019
by
Laszlo Agocs
Browse files
API cleanup: rt sizeInPixels->pixelSize
parent
d4269c27
Changes
14
Hide whitespace changes
Inline
Side-by-side
examples/rhi/imguidemo/qrhiimgui.cpp
View file @
2f4c4b7a
...
...
@@ -87,7 +87,7 @@ bool QRhiImgui::prepareFrame(QRhiRenderTarget *rt, QRhiRenderPassDescriptor *rp,
io
.
Fonts
->
SetTexID
(
reinterpret_cast
<
ImTextureID
>
(
quintptr
(
d
->
textures
.
count
()
-
1
)));
}
const
QSize
outputSize
=
rt
->
sizeInPixels
();
const
QSize
outputSize
=
rt
->
pixelSize
();
const
float
dpr
=
rt
->
devicePixelRatio
();
io
.
DisplaySize
.
x
=
outputSize
.
width
()
/
dpr
;
io
.
DisplaySize
.
y
=
outputSize
.
height
()
/
dpr
;
...
...
examples/rhi/mrt/mrt.cpp
View file @
2f4c4b7a
...
...
@@ -191,7 +191,7 @@ void Window::customInit()
d
.
triPs
->
build
();
d
.
triBaseMvp
=
m_r
->
clipSpaceCorrMatrix
();
d
.
triBaseMvp
.
perspective
(
45.0
f
,
d
.
rt
->
sizeInPixels
().
width
()
/
float
(
d
.
rt
->
sizeInPixels
().
height
()),
0.01
f
,
1000.0
f
);
d
.
triBaseMvp
.
perspective
(
45.0
f
,
d
.
rt
->
pixelSize
().
width
()
/
float
(
d
.
rt
->
pixelSize
().
height
()),
0.01
f
,
1000.0
f
);
d
.
triBaseMvp
.
translate
(
0
,
0
,
-
2
);
float
opacity
=
1.0
f
;
d
.
initialUpdates
->
updateDynamicBuffer
(
d
.
triUbuf
,
64
,
4
,
&
opacity
);
...
...
@@ -214,13 +214,6 @@ void Window::customRender()
d
.
initialUpdates
=
nullptr
;
}
if
(
d
.
winProj
!=
m_proj
)
{
d
.
winProj
=
m_proj
;
QMatrix4x4
mvp
=
m_proj
;
mvp
.
scale
(
2.5
f
);
u
->
updateDynamicBuffer
(
d
.
ubuf
,
0
,
64
,
mvp
.
constData
());
}
QMatrix4x4
triMvp
=
d
.
triBaseMvp
;
triMvp
.
rotate
(
d
.
triRot
,
0
,
1
,
0
);
d
.
triRot
+=
1
;
...
...
@@ -228,12 +221,19 @@ void Window::customRender()
cb
->
beginPass
(
d
.
rt
,
{
0.5
f
,
0.2
f
,
0
,
1
},
{
1
,
0
},
u
);
cb
->
setGraphicsPipeline
(
d
.
triPs
);
cb
->
setViewport
({
0
,
0
,
float
(
d
.
rt
->
sizeInPixels
().
width
()),
float
(
d
.
rt
->
sizeInPixels
().
height
())
});
cb
->
setViewport
({
0
,
0
,
float
(
d
.
rt
->
pixelSize
().
width
()),
float
(
d
.
rt
->
pixelSize
().
height
())
});
cb
->
setShaderResources
();
cb
->
setVertexInput
(
0
,
{
{
d
.
vbuf
,
sizeof
(
quadVertexData
)
}
});
cb
->
draw
(
3
);
cb
->
endPass
();
if
(
d
.
winProj
!=
m_proj
)
{
d
.
winProj
=
m_proj
;
QMatrix4x4
mvp
=
m_proj
;
mvp
.
translate
(
-
2
,
0
,
0
);
u
->
updateDynamicBuffer
(
d
.
ubuf
,
0
,
64
,
mvp
.
constData
());
}
const
QSize
outputSizeInPixels
=
m_sc
->
currentPixelSize
();
cb
->
beginPass
(
m_sc
->
currentFrameRenderTarget
(),
{
0.4
f
,
0.7
f
,
0.0
f
,
1.0
f
},
{
1.0
f
,
0
});
cb
->
setGraphicsPipeline
(
d
.
ps
);
...
...
src/rhi/qrhi.cpp
View file @
2f4c4b7a
...
...
@@ -2070,7 +2070,7 @@ QRhiRenderTarget::QRhiRenderTarget(QRhiImplementation *rhi)
*/
/*!
\fn QSize QRhiRenderTarget::
sizeInPixels
() const
\fn QSize QRhiRenderTarget::
pixelSize
() const
\return the size in pixels.
*/
...
...
src/rhi/qrhi.h
View file @
2f4c4b7a
...
...
@@ -812,7 +812,7 @@ public:
};
virtual
Type
type
()
const
=
0
;
virtual
QSize
sizeInPixels
()
const
=
0
;
virtual
QSize
pixelSize
()
const
=
0
;
virtual
float
devicePixelRatio
()
const
=
0
;
virtual
int
sampleCount
()
const
=
0
;
...
...
src/rhi/qrhid3d11.cpp
View file @
2f4c4b7a
...
...
@@ -611,7 +611,7 @@ void QRhiD3D11::setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport)
const
QVector4D
r
=
viewport
.
viewport
();
cmd
.
args
.
viewport
.
x
=
r
.
x
();
// d3d expects top-left, QRhiViewport is bottom-left
cmd
.
args
.
viewport
.
y
=
cbD
->
currentTarget
->
sizeInPixels
().
height
()
-
(
r
.
y
()
+
r
.
w
());
cmd
.
args
.
viewport
.
y
=
cbD
->
currentTarget
->
pixelSize
().
height
()
-
(
r
.
y
()
+
r
.
w
());
cmd
.
args
.
viewport
.
w
=
r
.
z
();
cmd
.
args
.
viewport
.
h
=
r
.
w
();
cmd
.
args
.
viewport
.
d0
=
viewport
.
minDepth
();
...
...
@@ -629,7 +629,7 @@ void QRhiD3D11::setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor)
const
QVector4D
r
=
scissor
.
scissor
();
cmd
.
args
.
scissor
.
x
=
r
.
x
();
// d3d expects top-left, QRhiScissor is bottom-left
cmd
.
args
.
scissor
.
y
=
cbD
->
currentTarget
->
sizeInPixels
().
height
()
-
(
r
.
y
()
+
r
.
w
());
cmd
.
args
.
scissor
.
y
=
cbD
->
currentTarget
->
pixelSize
().
height
()
-
(
r
.
y
()
+
r
.
w
());
cmd
.
args
.
scissor
.
w
=
r
.
z
();
cmd
.
args
.
scissor
.
h
=
r
.
w
();
cbD
->
commands
.
append
(
cmd
);
...
...
@@ -2276,7 +2276,7 @@ QRhiRenderTarget::Type QD3D11ReferenceRenderTarget::type() const
return
RtRef
;
}
QSize
QD3D11ReferenceRenderTarget
::
sizeInPixels
()
const
QSize
QD3D11ReferenceRenderTarget
::
pixelSize
()
const
{
return
d
.
pixelSize
;
}
...
...
@@ -2436,7 +2436,7 @@ QRhiRenderTarget::Type QD3D11TextureRenderTarget::type() const
return
RtTexture
;
}
QSize
QD3D11TextureRenderTarget
::
sizeInPixels
()
const
QSize
QD3D11TextureRenderTarget
::
pixelSize
()
const
{
return
d
.
pixelSize
;
}
...
...
src/rhi/qrhid3d11_p.h
View file @
2f4c4b7a
...
...
@@ -147,7 +147,7 @@ struct QD3D11ReferenceRenderTarget : public QRhiRenderTarget
void
release
()
override
;
Type
type
()
const
override
;
QSize
sizeInPixels
()
const
override
;
QSize
pixelSize
()
const
override
;
float
devicePixelRatio
()
const
override
;
int
sampleCount
()
const
override
;
...
...
@@ -160,7 +160,7 @@ struct QD3D11TextureRenderTarget : public QRhiTextureRenderTarget
void
release
()
override
;
Type
type
()
const
override
;
QSize
sizeInPixels
()
const
override
;
QSize
pixelSize
()
const
override
;
float
devicePixelRatio
()
const
override
;
int
sampleCount
()
const
override
;
...
...
src/rhi/qrhigles2.cpp
View file @
2f4c4b7a
...
...
@@ -2260,7 +2260,7 @@ QRhiRenderTarget::Type QGles2ReferenceRenderTarget::type() const
return
RtRef
;
}
QSize
QGles2ReferenceRenderTarget
::
sizeInPixels
()
const
QSize
QGles2ReferenceRenderTarget
::
pixelSize
()
const
{
return
d
.
pixelSize
;
}
...
...
@@ -2384,7 +2384,7 @@ QRhiRenderTarget::Type QGles2TextureRenderTarget::type() const
return
RtTexture
;
}
QSize
QGles2TextureRenderTarget
::
sizeInPixels
()
const
QSize
QGles2TextureRenderTarget
::
pixelSize
()
const
{
return
d
.
pixelSize
;
}
...
...
src/rhi/qrhigles2_p.h
View file @
2f4c4b7a
...
...
@@ -143,7 +143,7 @@ struct QGles2ReferenceRenderTarget : public QRhiRenderTarget
void
release
()
override
;
Type
type
()
const
override
;
QSize
sizeInPixels
()
const
override
;
QSize
pixelSize
()
const
override
;
float
devicePixelRatio
()
const
override
;
int
sampleCount
()
const
override
;
...
...
@@ -156,7 +156,7 @@ struct QGles2TextureRenderTarget : public QRhiTextureRenderTarget
void
release
()
override
;
Type
type
()
const
override
;
QSize
sizeInPixels
()
const
override
;
QSize
pixelSize
()
const
override
;
float
devicePixelRatio
()
const
override
;
int
sampleCount
()
const
override
;
...
...
src/rhi/qrhimetal.mm
View file @
2f4c4b7a
...
...
@@ -845,7 +845,7 @@ void QRhiMetal::setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport)
Q_ASSERT
(
inPass
);
QMetalCommandBuffer
*
cbD
=
QRHI_RES
(
QMetalCommandBuffer
,
cb
);
Q_ASSERT
(
cbD
->
currentPipeline
&&
cbD
->
currentTarget
);
const
QSize
outputSize
=
cbD
->
currentTarget
->
sizeInPixels
();
const
QSize
outputSize
=
cbD
->
currentTarget
->
pixelSize
();
const
MTLViewport
vp
=
toMetalViewport
(
viewport
,
outputSize
);
[
cbD
->
d
->
currentPassEncoder
setViewport
:
vp
];
...
...
@@ -862,7 +862,7 @@ void QRhiMetal::setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor)
QMetalCommandBuffer
*
cbD
=
QRHI_RES
(
QMetalCommandBuffer
,
cb
);
Q_ASSERT
(
cbD
->
currentPipeline
&&
cbD
->
currentTarget
);
Q_ASSERT
(
QRHI_RES
(
QMetalGraphicsPipeline
,
cbD
->
currentPipeline
)
->
m_flags
.
testFlag
(
QRhiGraphicsPipeline
::
UsesScissor
));
const
QSize
outputSize
=
cbD
->
currentTarget
->
sizeInPixels
();
const
QSize
outputSize
=
cbD
->
currentTarget
->
pixelSize
();
const
MTLScissorRect
s
=
toMetalScissor
(
scissor
,
outputSize
);
[
cbD
->
d
->
currentPassEncoder
setScissorRect
:
s
];
}
...
...
@@ -2235,7 +2235,7 @@ QRhiRenderTarget::Type QMetalReferenceRenderTarget::type() const
return
RtRef
;
}
QSize
QMetalReferenceRenderTarget
::
sizeInPixels
()
const
QSize
QMetalReferenceRenderTarget
::
pixelSize
()
const
{
return
d
->
pixelSize
;
}
...
...
@@ -2358,7 +2358,7 @@ QRhiRenderTarget::Type QMetalTextureRenderTarget::type() const
return
RtTexture
;
}
QSize
QMetalTextureRenderTarget
::
sizeInPixels
()
const
QSize
QMetalTextureRenderTarget
::
pixelSize
()
const
{
return
d
->
pixelSize
;
}
...
...
src/rhi/qrhimetal_p.h
View file @
2f4c4b7a
...
...
@@ -150,7 +150,7 @@ struct QMetalReferenceRenderTarget : public QRhiRenderTarget
void
release
()
override
;
Type
type
()
const
override
;
QSize
sizeInPixels
()
const
override
;
QSize
pixelSize
()
const
override
;
float
devicePixelRatio
()
const
override
;
int
sampleCount
()
const
override
;
...
...
@@ -164,7 +164,7 @@ struct QMetalTextureRenderTarget : public QRhiTextureRenderTarget
void
release
()
override
;
Type
type
()
const
override
;
QSize
sizeInPixels
()
const
override
;
QSize
pixelSize
()
const
override
;
float
devicePixelRatio
()
const
override
;
int
sampleCount
()
const
override
;
...
...
src/rhi/qrhinull.cpp
View file @
2f4c4b7a
...
...
@@ -463,7 +463,7 @@ QRhiRenderTarget::Type QNullReferenceRenderTarget::type() const
return
RtRef
;
}
QSize
QNullReferenceRenderTarget
::
sizeInPixels
()
const
QSize
QNullReferenceRenderTarget
::
pixelSize
()
const
{
return
d
.
pixelSize
;
}
...
...
@@ -516,7 +516,7 @@ QRhiRenderTarget::Type QNullTextureRenderTarget::type() const
return
RtTexture
;
}
QSize
QNullTextureRenderTarget
::
sizeInPixels
()
const
QSize
QNullTextureRenderTarget
::
pixelSize
()
const
{
return
d
.
pixelSize
;
}
...
...
src/rhi/qrhinull_p.h
View file @
2f4c4b7a
...
...
@@ -103,7 +103,7 @@ struct QNullReferenceRenderTarget : public QRhiRenderTarget
void
release
()
override
;
Type
type
()
const
override
;
QSize
sizeInPixels
()
const
override
;
QSize
pixelSize
()
const
override
;
float
devicePixelRatio
()
const
override
;
int
sampleCount
()
const
override
;
...
...
@@ -116,7 +116,7 @@ struct QNullTextureRenderTarget : public QRhiTextureRenderTarget
void
release
()
override
;
Type
type
()
const
override
;
QSize
sizeInPixels
()
const
override
;
QSize
pixelSize
()
const
override
;
float
devicePixelRatio
()
const
override
;
int
sampleCount
()
const
override
;
...
...
src/rhi/qrhivulkan.cpp
View file @
2f4c4b7a
...
...
@@ -3277,7 +3277,7 @@ void QRhiVulkan::setViewport(QRhiCommandBuffer *cb, const QRhiViewport &viewport
Q_ASSERT
(
inPass
);
QVkCommandBuffer
*
cbD
=
QRHI_RES
(
QVkCommandBuffer
,
cb
);
Q_ASSERT
(
cbD
->
currentPipeline
&&
cbD
->
currentTarget
);
const
QSize
outputSize
=
cbD
->
currentTarget
->
sizeInPixels
();
const
QSize
outputSize
=
cbD
->
currentTarget
->
pixelSize
();
const
VkViewport
vp
=
toVkViewport
(
viewport
,
outputSize
);
df
->
vkCmdSetViewport
(
cbD
->
cb
,
0
,
1
,
&
vp
);
...
...
@@ -3294,7 +3294,7 @@ void QRhiVulkan::setScissor(QRhiCommandBuffer *cb, const QRhiScissor &scissor)
QVkCommandBuffer
*
cbD
=
QRHI_RES
(
QVkCommandBuffer
,
cb
);
Q_ASSERT
(
cbD
->
currentPipeline
&&
cbD
->
currentTarget
);
Q_ASSERT
(
QRHI_RES
(
QVkGraphicsPipeline
,
cbD
->
currentPipeline
)
->
m_flags
.
testFlag
(
QRhiGraphicsPipeline
::
UsesScissor
));
const
VkRect2D
s
=
toVkScissor
(
scissor
,
cbD
->
currentTarget
->
sizeInPixels
());
const
VkRect2D
s
=
toVkScissor
(
scissor
,
cbD
->
currentTarget
->
pixelSize
());
df
->
vkCmdSetScissor
(
cbD
->
cb
,
0
,
1
,
&
s
);
}
...
...
@@ -4203,7 +4203,7 @@ QRhiRenderTarget::Type QVkReferenceRenderTarget::type() const
return
RtRef
;
// no Vk* are owned directly by the object
}
QSize
QVkReferenceRenderTarget
::
sizeInPixels
()
const
QSize
QVkReferenceRenderTarget
::
pixelSize
()
const
{
return
d
.
pixelSize
;
}
...
...
@@ -4415,7 +4415,7 @@ QRhiRenderTarget::Type QVkTextureRenderTarget::type() const
return
RtTexture
;
}
QSize
QVkTextureRenderTarget
::
sizeInPixels
()
const
QSize
QVkTextureRenderTarget
::
pixelSize
()
const
{
return
d
.
pixelSize
;
}
...
...
src/rhi/qrhivulkan_p.h
View file @
2f4c4b7a
...
...
@@ -169,7 +169,7 @@ struct QVkReferenceRenderTarget : public QRhiRenderTarget
void
release
()
override
;
Type
type
()
const
override
;
QSize
sizeInPixels
()
const
override
;
QSize
pixelSize
()
const
override
;
float
devicePixelRatio
()
const
override
;
int
sampleCount
()
const
override
;
...
...
@@ -182,7 +182,7 @@ struct QVkTextureRenderTarget : public QRhiTextureRenderTarget
void
release
()
override
;
Type
type
()
const
override
;
QSize
sizeInPixels
()
const
override
;
QSize
pixelSize
()
const
override
;
float
devicePixelRatio
()
const
override
;
int
sampleCount
()
const
override
;
...
...
Write
Preview
Supports
Markdown
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