summaryrefslogtreecommitdiffstats
path: root/src/render
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge branch '5.12' into dev" into refs/staging/devSean Harmer2018-10-119-1/+44
|\
| * Merge branch '5.12' into devSean Harmer2018-10-119-1/+44
| |\
| | * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-059-1/+62
| | |\
| | | * Further complete missing functions on ES3 helpersPaul Lemire2018-10-044-0/+23
| | | * Fix leak with VAOManagerPaul Lemire2018-10-033-1/+8
| | | * Add metalRoughFunction to ES3Mauro Persano2018-09-271-0/+9
| | | * ES3 deprecated gl_FragColor, use output variable insteadMauro Persano2018-09-271-0/+9
| | | * Use GLSL texture() instead of texture2D() on ES3Mauro Persano2018-09-271-0/+9
| | | * GLTexture: mark texture for upload when it's recreated and contains dataPaul Lemire2018-09-241-0/+4
* | | | Renderer: implement using OpenGL textures from a texture idPaul Lemire2018-10-116-72/+263
|/ / /
* | | QAbstractTexture:: add handle and handleType propertiesPaul Lemire2018-10-103-0/+100
* | | Introduce QSetFence/QWaitFence to synchronize with 3rd party enginesPaul Lemire2018-10-107-2/+752
* | | Add QSharedGLTexturePaul Lemire2018-10-086-1/+94
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-058-4/+209
|\| |
| * | Add private export to GraphicsApiFilterDatav5.12.0-beta1Svenn-Arne Dragly2018-10-021-1/+1
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-227-3/+208
| |\|
| | * Complete ES 3.1 and 3.2 helpersPaul Lemire2018-09-217-3/+208
* | | Use GLSL texture() instead of texture2D() on ES3Mauro Persano2018-09-241-0/+9
* | | ES3 deprecated gl_FragColor, use output variable insteadMauro Persano2018-09-241-0/+9
|/ /
* | Fix warning about ignored qualifiersThiago Macieira2018-09-051-1/+1
* | Add private API to access child nodes of QEntity and QFrameGraphNodeSvenn-Arne Dragly2018-09-034-2/+53
* | Privately export ShaderBuilderPaul Lemire2018-08-291-1/+1
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-08-251-1/+1
|\|
| * Fix: remove compile warning in graphicscontext.cppPaul Lemire2018-08-211-1/+1
* | Renderer: remove code shutting down thread in renderer dtorPaul Lemire2018-08-201-4/+2
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-1713-143/+205
|\|
| * Remove AUTOTEST_EXPORT from templated functionLaszlo Agocs2018-08-151-1/+1
| * Avoid initializing GraphicsContext on every frameLaszlo Agocs2018-08-142-4/+1
| * Texture property update: notify frontend only when properties have changedPaul Lemire2018-08-143-1/+4
| * GLTexture: simplify createOrUpdateGLFunctionPaul Lemire2018-08-142-59/+71
| * Texture: remove invalid property namePaul Lemire2018-08-131-3/+0
| * Fix typo on loadscenejob.cppPaul Lemire2018-08-131-1/+1
| * ResourceAccessor: allow read-only access to texturesLaszlo Agocs2018-08-102-4/+13
| * Properly update properties from Backend to Frontend texturesPaul Lemire2018-08-089-71/+115
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-311-0/+1
|\|
| * Request manager to cleanup ShaderBuilder entries that are removedPaul Lemire2018-07-301-0/+1
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-2115-182/+283
|\|
| * QTextureImage: warn user that remote urls on QTextureImage aren't yet supportedPaul Lemire2018-07-201-1/+11
| * Texture: properly handle texture sharing with remote URLsPaul Lemire2018-07-206-37/+106
| * Fix crash when using Scene3D and updating data frequentlyPaul Lemire2018-07-201-1/+25
| * Fix: Do not enforce TextureImage to be parented only by TexturePaul Lemire2018-07-188-92/+73
| * CalcBoundingVolumeJob: handle UnsignedByte index typePaul Lemire2018-07-182-41/+58
| * Renderer: do not lookup cleanup texturesPaul Lemire2018-07-183-10/+10
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-144-12/+28
|\|
| * Do not delay cleanup of backend Texture instancesPaul Lemire2018-07-114-12/+28
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-071-4/+0
|\|
| * Entity: don't release child data in cleanupPaul Lemire2018-07-061-4/+0
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-3012-58/+236
|\|
| * Doc: Fix QRenderAspect \inmodule commandTopi Reinio2018-06-271-2/+2
| * Fix QTextureImageData data access with individual TextureImagesLaszlo Agocs2018-06-271-3/+5