Commit Graph

16 Commits

Author SHA1 Message Date
Juan Jose Casafranca 22d24c1826 Add QRasterMode render state
QRasterMode allows a user to change the raster mode from fill to lines or points

Change-Id: If96848e38ac4b5a615040b3bae2dec38a03cb031
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
2019-02-12 11:20:48 +00:00
Edward Welbourne be686dbf6e Remove GPU_BLACKLIST support from various tests
The feature has been unused for some time and shall be reduced from
qtbase in due course.

Change-Id: I9e2b655dacd8290fa396588b03238399139259f7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-10-12 11:50:47 +00:00
Paul Lemire 1739b90d61 Implement WaitFence/SetFence handling into the renderer
Slightly reorganize jobs between jobs needed for rendering and jobs
that should run even when no rendering is required.

Change-Id: I02d262efd8cb46c71c40ac6dbcd4d1b25bb725e1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2018-10-12 05:53:02 +00:00
Juan José Casafranca a340ae601a BlitFramebuffer framegraph node
This node allows to copy the content from one FBO to another or to screen

Task-number: QTBUG-58162
Change-Id: I6016c46d9d538a012c2f641116ed766dd70ad021
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-08-23 13:04:03 +00:00
Sean Harmer 8f863343a9 Merge branch '5.9' into dev
Conflicts:
	src/render/backend/renderer.cpp
	src/render/backend/renderview.cpp
	src/render/graphicshelpers/graphicscontext_p.h
	src/render/graphicshelpers/graphicshelperes2_p.h
	src/render/graphicshelpers/graphicshelpergl2_p.h
	src/render/graphicshelpers/graphicshelpergl3_2_p.h
	src/render/graphicshelpers/graphicshelpergl3_3_p.h
	src/render/graphicshelpers/graphicshelpergl4_p.h
	src/render/graphicshelpers/graphicshelperinterface_p.h
	src/render/jobs/pickboundingvolumejob.cpp
	tests/auto/animation/clipanimator/tst_clipanimator.cpp
	tests/auto/auto.pro
	tests/manual/manual.pro

Also disabled the QQmlMetaType codepaths following commit
49a11e882059ee1729f776722e085dd21d378c36 in qtdeclarative. The
QQmlMetaType codepaths will be re-enabled once a qt5.git
integration has succeeded.

Change-Id: Ia654d75425e6d406c472d19864383612208cad2b
2017-08-19 16:28:52 +01:00
Sean Harmer 8103be87b5 Add wrappers for glEnableVertexAttrib and glVertexAttrib*Pointer
Needed to work around QTBUG-43199 to be able to specify integer
vertex attributes such as joint indices.

Change-Id: I39ab83e881b6afb75467c76b56125917013b3bca
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-08-10 10:41:30 +00:00
Paul Lemire d826206802 RenderCapture: read back from the correct framebuffer
Up until now, RenderCapture would read back from the back buffer. In cases
where it's used within a RenderTargetSelector, it should instead read back
from the ColorAttachment0 of the framebuffer.
Later on we might allow to specify the ColorAttachment.

Change-Id: I9ca94333184338b2fdb79c5c2668d5929ac8d405
Task-number: QTBUG-61547
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
2017-07-17 09:28:56 +00:00
Sean Harmer fc57d48db9 Revert to using new window for each test
Now that the underlying problem from QTBUG-58107 in the macOS QPA is
fixed we can go back to using a fresh window for each test function.

Task-number: QTBUG-58107
Change-Id: If77fa7dbcb5b8b1a7e096e262832297ce871313d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2017-05-07 16:35:40 +00:00
Giuseppe D'Angelo a2b7483fa1 Try to investigate why tst_GraphicsHelperGL3_3::blitFramebuffer() fails
Change-Id: Ide10e84479bdcfea71c29cd46b8a29199574d856
Task-number: QTBUG-59828
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-04-18 19:15:31 +00:00
Giuseppe D'Angelo 50712f7975 tst_GraphicsHelperGL3_3: remove blacklist of blitFramebuffer
Got fixed in the meanwhile.

Change-Id: I3efccd988b39b77bebab628bbf637b302a247cef
Task-number: QTBUG-59828
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-04-18 13:40:54 +00:00
Giuseppe D'Angelo ba060af041 tst_GraphicsHelperGL3_3::blitFramebuffer(): check how many samples are supported
We can't just generate a multisampled 2D texture with 4 samples per texel;
we need to check the implementation-defined maximum amount of samples.

Lacking glGetInternalformat*, query GL_MAX_SAMPLES. Since OpenGL does not
mandate a minimum, getting 0 is actually allowed; glTexImage2DMultisample
however does not accept 0 as number of samples, hence skip the test in that
case.

Change-Id: Id1b0c9705aed0665093aae44983eac8b656b676f
Task-number: QTBUG-59828
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-04-18 13:40:48 +00:00
Tony Sarajärvi c70a1d339e Blacklist tst_GraphicsHelperGL3_3::blitFramebuffer on Ubuntu 16.04
Task-number: QTBUG-59828
Change-Id: I5fc74639dc9bffcccdfc42655656ba37822ae07c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-31 06:12:14 +00:00
Sean Harmer 50457f2025 Don't recreate window very rapidly in test case
Something in the QPA or with hardware GL in macOS must have changed
that now makes this scenario crash at random. Let's bypass it by
just creating a single context and window for the whole set of
tests.

Task-number: QTBUG-58107
Change-Id: Ib9a9daf2fe8502ab99c280edf46c007d44a5a1b7
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2017-01-12 17:10:49 +00:00
Paul Lemire e5c81bf412 GraphicsHelper: unit tests completed
Check that when a cube map is used with the AllFaces attachment point, then it
should appear as layered when queried and non layered if a single face was
used as the attachment point.

Change-Id: Ia47152aff8b47f717de3c40fa894a15c17503269
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2016-11-19 18:33:10 +00:00
Antti Määttä 4428b5d869 Add unit tests for graphics helper blitFramebuffer function
Also fix compiler warnings and errors

Change-Id: Ibbce47bd73778eece5648360b98896bb68a39c75
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2016-10-20 08:21:05 +00:00
Paul Lemire cf1321a0ec Add unit tests for graphicshelpergl3_3
Change-Id: I31f10d70856369e61cb00685949bb30850803dcc
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2016-10-08 13:42:16 +00:00