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

QtGui: kill some unneeded relocations 

Turn arrays of pointers into arrays of arrays.

Results on optimized GCC 6.1.1 Linux AMD64 builds:
  text  -264B
  data  -512B
  relocs -43

Change-Id: I0b64615913d50c286596e66675e89758ce1ec2ba
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Marc Mutz 2017-02-24 00:15:06 +01:00
parent f4495d29e5
commit 5a7165f2ea
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/opengl/qopenglengineshadermanager.cpp
View File

@ -532,7 +532,7 @@ GLuint QOpenGLEngineShaderManager::getUniformLocation(Uniform id)
if (uniformLocations.isEmpty())
uniformLocations.fill(GLuint(-1), NumUniforms);
static const char *const uniformNames[] = {
const char uniformNames[][26] = {
"imageTexture",
"patternColor",
"globalOpacity",

4
src/gui/painting/qbrush.cpp
View File

@ -1006,7 +1006,7 @@ bool QBrush::operator==(const QBrush &b) const
*/
QDebug operator<<(QDebug dbg, const QBrush &b)
{
static const char *const BRUSH_STYLES[] = {
static const char BRUSH_STYLES[][24] = {
"NoBrush",
"SolidPattern",
"Dense1Pattern",
@ -1025,7 +1025,7 @@ QDebug operator<<(QDebug dbg, const QBrush &b)
"LinearGradientPattern",
"RadialGradientPattern",
"ConicalGradientPattern",
0, 0, 0, 0, 0, 0,
"", "", "", "", "", "",
"TexturePattern" // 24
};

8
src/gui/painting/qtransform.cpp
View File

@ -1118,16 +1118,16 @@ QDataStream & operator>>(QDataStream &s, QTransform &t)
#ifndef QT_NO_DEBUG_STREAM
QDebug operator<<(QDebug dbg, const QTransform &m)
{
static const char *const typeStr[] =
static const char typeStr[][12] =
{
"TxNone",
"TxTranslate",
"TxScale",
0,
"",
"TxRotate",
0, 0, 0,
"", "", "",
"TxShear",
0, 0, 0, 0, 0, 0, 0,
"", "", "", "", "", "", "",
"TxProject"
};