whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix QtOpenGL tracepoints 

Make use of supported types only. As such,
QOpenGL2PaintEngineExPrivate_drawTexture_entry has to be adjusted so
that it does not exceed the maximum number of supported parameters by
LTTNG, and thus the 'pattern' argument had to be dropped.

Change-Id: I8d1c1dea7de82063926502d77dde1063b2096b73
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
bb10
Rafael Roquetto 2022-07-28 11:11:15 +10:00 committed by Rafael Roquetto
parent c3b05dfbc3
commit 545e8122a7
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/opengl/qopenglpaintengine.cpp
View File

@ -608,7 +608,16 @@ static inline void setCoords(GLfloat *coords, const QOpenGLRect &rect)
void QOpenGL2PaintEngineExPrivate::drawTexture(const QOpenGLRect& dest, const QOpenGLRect& src, const QSize &textureSize, bool opaque, bool pattern)
{
Q_TRACE_SCOPE(QOpenGL2PaintEngineExPrivate_drawTexture, dest, src, textureSize, opaque, pattern);
Q_TRACE_SCOPE(QOpenGL2PaintEngineExPrivate_drawTexture,
dest.left,
dest.top,
dest.right,
dest.bottom,
src.left,
src.top,
src.right,
src.bottom,
textureSize, opaque);
// Setup for texture drawing
currentBrush = noBrush;

2
src/opengl/qopengltexturecache.cpp
View File

@ -123,7 +123,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, const QImage &i
GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, const QImage &image, QOpenGLTextureUploader::BindOptions options)
{
Q_TRACE_SCOPE(QOpenGLTextureCache_bindTexture, context, key, image, options);
Q_TRACE_SCOPE(QOpenGLTextureCache_bindTexture, context, key, image.bits(), options);
GLuint id;
QOpenGLFunctions *funcs = context->functions();

6
src/opengl/qtopengl.tracepoints
View File

@ -4,9 +4,9 @@
#include <qopenglframebufferobject.h>
}
QOpenGLFramebufferObjectPrivate_init_entry(QOpenGLFramebufferObject *qfbo, const QSize &size, QOpenGLFramebufferObject::Attachment attachment, GLenum texture_target, GLenum internal_format, GLint samples, bool mipmap)
QOpenGLFramebufferObjectPrivate_init_entry(QOpenGLFramebufferObject *qfbo, const QSize &size, int attachment, int texture_target, int internal_format, int samples, bool mipmap)
QOpenGLFramebufferObjectPrivate_init_exit()
QOpenGL2PaintEngineExPrivate_drawTexture_entry(const QOpenGLRect& dest, const QOpenGLRect& src, const QSize &textureSize, bool opaque, bool pattern)
QOpenGL2PaintEngineExPrivate_drawTexture_entry(float dl, float dt, float dr, float db, float sl, float st, float sr, float sb, const QSize &textureSize, bool opaque)
QOpenGL2PaintEngineExPrivate_drawTexture_exit()
QOpenGLTextureCache_bindTexture_entry(QOpenGLContext *context, qint64 key, const QImage &image, QOpenGLTextureUploader::BindOptions options)
QOpenGLTextureCache_bindTexture_entry(QOpenGLContext *context, qint64 key, const unsigned char *image, int options)
QOpenGLTextureCache_bindTexture_exit()