" font-weight:bold;\n"
// text shadow looks great but doesn't work well in qtwebkit 4.7
" /*text-shadow: 0px 2px 3px #555;*/\n"
- " font-size: 1.2em;\n"
+ " font-size: 1.1em;\n"
"}\n"
".arg-name {\n"
" border: 1px solid rgb(238,206,0);\n"
return QLatin1String("?");
}
- if (variant.userType() == QVariant::Double) {
+ if (variant.userType() == QMetaType::Float) {
return QString::number(variant.toFloat());
}
+ if (variant.userType() == QVariant::Double) {
+ return QString::number(variant.toDouble());
+ }
if (variant.userType() == QVariant::ByteArray) {
if (variant.toByteArray().size() < 1024) {
int bytes = variant.toByteArray().size();
m_variant = QVariant(node->value);
}
+void VariantVisitor::visit(trace::Double *node)
+{
+ m_variant = QVariant(node->value);
+}
+
void VariantVisitor::visit(trace::String *node)
{
m_variant = QVariant(QString::fromStdString(node->value));
sig = m_loader->enumSignature(e->sig->id);
}
if (!sig) {
- sig = new ApiTraceEnumSignature(
- QString::fromStdString(e->sig->name),
- QVariant(e->sig->value));
+ sig = new ApiTraceEnumSignature(e->sig);
if (m_loader) {
m_loader->addEnumSignature(e->sig->id, sig);
}
}
- m_variant = QVariant::fromValue(ApiEnum(sig));
+ m_variant = QVariant::fromValue(ApiEnum(sig, e->value));
}
void VariantVisitor::visit(trace::Bitmask *bitmask)
m_variant = QVariant::fromValue(ApiPointer(ptr->value));
}
+void VariantVisitor::visit(trace::Repr *repr)
+{
+ /* TODO: Preserve both the human and machine value */
+ repr->humanValue->visit(*this);
+}
+
+ApiTraceEnumSignature::ApiTraceEnumSignature(const trace::EnumSig *sig)
+{
+ for (const trace::EnumValue *it = sig->values;
+ it != sig->values + sig->num_values; ++it) {
+ QPair<QString, signed long long> pair;
+
+ pair.first = QString::fromStdString(it->name);
+ pair.second = it->value;
+
+ m_names.append(pair);
+ }
+}
+
+QString ApiTraceEnumSignature::name(signed long long value) const
+{
+ for (ValueList::const_iterator it = m_names.begin();
+ it != m_names.end(); ++it) {
+ if (value == it->second) {
+ return it->first;
+ }
+ }
+ return QString::fromLatin1("%1").arg(value);
+}
-ApiEnum::ApiEnum(ApiTraceEnumSignature *sig)
- : m_sig(sig)
+ApiEnum::ApiEnum(ApiTraceEnumSignature *sig, signed long long value)
+ : m_sig(sig), m_value(value)
{
}
QString ApiEnum::toString() const
{
if (m_sig) {
- return m_sig->name();
+ return m_sig->name(m_value);
}
Q_ASSERT(!"should never happen");
return QString();
QVariant ApiEnum::value() const
{
if (m_sig) {
- return m_sig->value();
+ return QVariant::fromValue(m_value);
}
Q_ASSERT(!"should never happen");
return QVariant();
QString ApiEnum::name() const
{
if (m_sig) {
- return m_sig->name();
+ return m_sig->name(m_value);
}
Q_ASSERT(!"should never happen");
return QString();
m_value = bitmask->value;
for (const trace::BitmaskFlag *it = bitmask->sig->flags;
it != bitmask->sig->flags + bitmask->sig->num_flags; ++it) {
- assert(it->value);
QPair<QString, unsigned long long> pair;
pair.first = QString::fromStdString(it->name);
QString str;
unsigned long long value = m_value;
bool first = true;
- for (Signature::const_iterator it = m_sig.begin();
- value != 0 && it != m_sig.end(); ++it) {
- Q_ASSERT(it->second);
- if ((value & it->second) == it->second) {
+ for (Signature::const_iterator it = m_sig.begin(); it != m_sig.end(); ++it) {
+ Q_ASSERT(it->second || first);
+ if ((it->second && (value & it->second) == it->second) ||
+ (!it->second && value == 0)) {
if (!first) {
str += QLatin1String(" | ");
}
value &= ~it->second;
first = false;
}
+ if (value == 0) {
+ break;
+ }
}
if (value || first) {
if (!first) {
QSize size(image[QLatin1String("__width__")].toInt(),
image[QLatin1String("__height__")].toInt());
QString cls = image[QLatin1String("__class__")].toString();
- QString type = image[QLatin1String("__type__")].toString();
- bool normalized =
- image[QLatin1String("__normalized__")].toBool();
- int numChannels =
- image[QLatin1String("__channels__")].toInt();
-
- Q_ASSERT(type == QLatin1String("uint8"));
- Q_ASSERT(normalized == true);
- Q_UNUSED(normalized);
+ int depth =
+ image[QLatin1String("__depth__")].toInt();
+ QString formatName =
+ image[QLatin1String("__format__")].toString();
QByteArray dataArray =
image[QLatin1String("__data__")].toByteArray();
ApiTexture tex;
tex.setSize(size);
- tex.setNumChannels(numChannels);
+ tex.setDepth(depth);
+ tex.setFormatName(formatName);
tex.setLabel(itr.key());
tex.contentsFromBase64(dataArray);
QSize size(buffer[QLatin1String("__width__")].toInt(),
buffer[QLatin1String("__height__")].toInt());
QString cls = buffer[QLatin1String("__class__")].toString();
- QString type = buffer[QLatin1String("__type__")].toString();
- bool normalized = buffer[QLatin1String("__normalized__")].toBool();
- int numChannels = buffer[QLatin1String("__channels__")].toInt();
-
- Q_ASSERT(type == QLatin1String("uint8"));
- Q_ASSERT(normalized == true);
- Q_UNUSED(normalized);
+ int depth = buffer[QLatin1String("__depth__")].toInt();
+ QString formatName = buffer[QLatin1String("__format__")].toString();
QByteArray dataArray =
buffer[QLatin1String("__data__")].toByteArray();
ApiFramebuffer fbo;
fbo.setSize(size);
- fbo.setNumChannels(numChannels);
+ fbo.setDepth(depth);
+ fbo.setFormatName(formatName);
fbo.setType(itr.key());
fbo.contentsFromBase64(dataArray);
m_framebuffers.append(fbo);
bool ApiTraceState::isEmpty() const
{
- return m_parameters.isEmpty();
+ return m_parameters.isEmpty() &&
+ m_shaderSources.isEmpty() &&
+ m_textures.isEmpty() &&
+ m_framebuffers.isEmpty();
}
const QList<ApiTexture> & ApiTraceState::textures() const
}
m_argValues.reserve(call->args.size());
for (int i = 0; i < call->args.size(); ++i) {
- if (call->args[i]) {
+ if (call->args[i].value) {
VariantVisitor argVisitor(loader);
- call->args[i]->visit(argVisitor);
+ call->args[i].value->visit(argVisitor);
m_argValues.append(argVisitor.variant());
if (m_argValues[i].type() == QVariant::ByteArray) {
m_hasBinaryData = true;
}
}
m_argValues.squeeze();
+ m_flags = call->flags;
}
ApiTraceCall::~ApiTraceCall()
return m_returnValue;
}
+trace::CallFlags ApiTraceCall::flags() const
+{
+ return m_flags;
+}
+
QUrl ApiTraceCall::helpUrl() const
{
return m_signature->helpUrl();
if (!m_richText.isEmpty())
return m_richText;
- m_richText = QLatin1String("<div class=\"call\">");
+ m_richText += QLatin1String("<div class=\"call\">");
+
+ m_richText +=
+ QString::fromLatin1("%1) ")
+ .arg(m_index);
+ QString parentTip;
+ if (m_parentFrame) {
+ parentTip =
+ QString::fromLatin1("Frame %1")
+ .arg(m_parentFrame->number);
+ }
QUrl helpUrl = m_signature->helpUrl();
if (helpUrl.isEmpty()) {
m_richText += QString::fromLatin1(
- "%1) <span class=\"callName\">%2</span>(")
- .arg(m_index)
+ "<span class=\"callName\" title=\"%1\">%2</span>(")
+ .arg(parentTip)
.arg(m_signature->name());
} else {
m_richText += QString::fromLatin1(
-
"%1) <span class=\"callName\"><a href=\"%2\">%3</a></span>(")
- .arg(m_index)
+
"<span class=\"callName\" title=\"%1\"><a href=\"%2\">%3</a></span>(")
+ .arg(parentTip)
.arg(helpUrl.toString())
.arg(m_signature->name());
}
return m_lastCallIndex;
}
}
+
+void ApiTraceFrame::setThumbnail(const QImage & thumbnail)
+{
+ m_thumbnail = thumbnail;
+}
+
+const QImage & ApiTraceFrame::thumbnail() const
+{
+ return m_thumbnail;
+}
projects / apitrace / blobdiff