Changeset View
Changeset View
Standalone View
Standalone View
libkwineffects/kwingltexture.cpp
Show First 20 Lines • Show All 107 Lines • ▼ Show 20 Line(s) | 105 | } static const table[] = { | |||
---|---|---|---|---|---|
108 | { 0, 0, 0 }, // QImage::Format_MonoLSB | 108 | { 0, 0, 0 }, // QImage::Format_MonoLSB | ||
109 | { GL_R8, GL_RED, GL_UNSIGNED_BYTE }, // QImage::Format_Indexed8 | 109 | { GL_R8, GL_RED, GL_UNSIGNED_BYTE }, // QImage::Format_Indexed8 | ||
110 | { GL_RGB8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV }, // QImage::Format_RGB32 | 110 | { GL_RGB8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV }, // QImage::Format_RGB32 | ||
111 | { 0, 0, 0 }, // QImage::Format_ARGB32 | 111 | { 0, 0, 0 }, // QImage::Format_ARGB32 | ||
112 | { GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV }, // QImage::Format_ARGB32_Premultiplied | 112 | { GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV }, // QImage::Format_ARGB32_Premultiplied | ||
113 | { GL_RGB8, GL_BGR, GL_UNSIGNED_SHORT_5_6_5_REV }, // QImage::Format_RGB16 | 113 | { GL_RGB8, GL_BGR, GL_UNSIGNED_SHORT_5_6_5_REV }, // QImage::Format_RGB16 | ||
114 | { 0, 0, 0 }, // QImage::Format_ARGB8565_Premultiplied | 114 | { 0, 0, 0 }, // QImage::Format_ARGB8565_Premultiplied | ||
115 | { 0, 0, 0 }, // QImage::Format_RGB666 | 115 | { 0, 0, 0 }, // QImage::Format_RGB666 | ||
116 | { 0, 0, 0 }, // QImage::Format_ARGB6666_Premultiplied | ||||
cfeck: So is it ARGB6666 or RGB666 ? | |||||
anemeth: Whoops, my mistake.
It's ARGB6666
Fixed | |||||
116 | { GL_RGB5, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV }, // QImage::Format_RGB555 | 117 | { GL_RGB5, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV }, // QImage::Format_RGB555 | ||
117 | { 0, 0, 0 }, // QImage::Format_ARGB8555_Premultiplied | 118 | { 0, 0, 0 }, // QImage::Format_ARGB8555_Premultiplied | ||
118 | { GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE }, // QImage::Format_RGB888 | 119 | { GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE }, // QImage::Format_RGB888 | ||
119 | { GL_RGB4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV }, // QImage::Format_RGB444 | 120 | { GL_RGB4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV }, // QImage::Format_RGB444 | ||
120 | { GL_RGBA4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV }, // QImage::Format_ARGB4444_Premultiplied | 121 | { GL_RGBA4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV }, // QImage::Format_ARGB4444_Premultiplied | ||
121 | { GL_RGB8, GL_RGBA, GL_UNSIGNED_BYTE }, // QImage::Format_RGBX8888 | 122 | { GL_RGB8, GL_RGBA, GL_UNSIGNED_BYTE }, // QImage::Format_RGBX8888 | ||
122 | { 0, 0, 0 }, // QImage::Format_RGBA8888 | 123 | { 0, 0, 0 }, // QImage::Format_RGBA8888 | ||
123 | { GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE }, // QImage::Format_RGBA8888_Premultiplied | 124 | { GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE }, // QImage::Format_RGBA8888_Premultiplied | ||
▲ Show 20 Lines • Show All 535 Lines • Show Last 20 Lines |
So is it ARGB6666 or RGB666 ?