mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Display fill ratio when showing FPS counter (bug 915342, r=bgirard).

This commit is contained in:
Andreas Gal 2013-09-11 23:57:23 +02:00
Родитель 6a944153af
Коммит 5ba463915b
4 изменённых файлов: 59 добавлений и 71 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
gfx/layers/Compositor.h
Просмотреть файл

@ -420,6 +420,14 @@ protected:
uint32_t mCompositorID;
static LayersBackend sBackend;
DiagnosticTypes mDiagnosticTypes;
/**
* We keep track of the total number of pixels filled as we composite the
* current frame. This value is an approximation and is not accurate,
* especially in the presence of transforms.
*/
size_t mPixelsPerFrame;
size_t mPixelsFilled;
};
} // namespace layers

117
gfx/layers/opengl/CompositorOGL.cpp
Просмотреть файл

@ -106,15 +106,11 @@ DrawWithVertexBuffer2(GLContext *aGLContext, VBOArena &aVBOs,
}
void
FPSState::DrawFPS(TimeStamp aNow,
GLContext* context, ShaderProgramOGL* copyprog)
FPSState::DrawCounter(float offset,
unsigned value,
GLContext* context,
ShaderProgramOGL* copyprog)
{
int fps = int(mCompositionFps.AddFrameAndGetFps(aNow));
int txnFps = int(mTransactionFps.GetFpsAt(aNow));
GLint viewport[4];
context->fGetIntegerv(LOCAL_GL_VIEWPORT, viewport);
if (!mTexture) {
// Bind the number of textures we need, in this case one.
context->fGenTextures(1, &mTexture);
@ -144,7 +140,8 @@ FPSState::DrawFPS(TimeStamp aNow,
free(buf);
}
mVBOs.Reset();
GLint viewport[4];
context->fGetIntegerv(LOCAL_GL_VIEWPORT, viewport);
struct Vertex2D {
float x,y;
@ -152,49 +149,26 @@ FPSState::DrawFPS(TimeStamp aNow,
float oneOverVP2 = 1.0 / viewport[2];
float oneOverVP3 = 1.0 / viewport[3];
const Vertex2D vertices[] = {
{ -1.0f, 1.0f - 42.f * oneOverVP3 },
{ -1.0f, 1.0f},
{ -1.0f + 22.f * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + 22.f * oneOverVP2, 1.0f },
{ -1.0f + (offset + 0.f) * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + (offset + 0.f) * oneOverVP2, 1.0f},
{ -1.0f + (offset + 22.f) * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + (offset + 22.f) * oneOverVP2, 1.0f },
{ -1.0f + 22.f * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + 22.f * oneOverVP2, 1.0f },
{ -1.0f + 44.f * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + 44.f * oneOverVP2, 1.0f },
{ -1.0f + (offset + 22.f) * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + (offset + 22.f) * oneOverVP2, 1.0f },
{ -1.0f + (offset + 44.f) * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + (offset + 44.f) * oneOverVP2, 1.0f },
{ -1.0f + 44.f * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + 44.f * oneOverVP2, 1.0f },
{ -1.0f + 66.f * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + 66.f * oneOverVP2, 1.0f }
{ -1.0f + (offset + 44.f) * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + (offset + 44.f) * oneOverVP2, 1.0f },
{ -1.0f + (offset + 66.f) * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + (offset + 66.f) * oneOverVP2, 1.0f }
};
const Vertex2D vertices2[] = {
{ -1.0f + 80.f * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + 80.f * oneOverVP2, 1.0f },
{ -1.0f + 102.f * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + 102.f * oneOverVP2, 1.0f },
unsigned v1 = value % 10;
unsigned v10 = (value % 100) / 10;
unsigned v100 = (value % 1000) / 100;
{ -1.0f + 102.f * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + 102.f * oneOverVP2, 1.0f },
{ -1.0f + 124.f * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + 124.f * oneOverVP2, 1.0f },
{ -1.0f + 124.f * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + 124.f * oneOverVP2, 1.0f },
{ -1.0f + 146.f * oneOverVP2, 1.0f - 42.f * oneOverVP3 },
{ -1.0f + 146.f * oneOverVP2, 1.0f },
};
int v1 = fps % 10;
int v10 = (fps % 100) / 10;
int v100 = (fps % 1000) / 100;
int txn1 = txnFps % 10;
int txn10 = (txnFps % 100) / 10;
int txn100 = (txnFps % 1000) / 100;
// Feel free to comment these texture coordinates out and use one
// of the ones below instead, or play around with your own values.
const GLfloat texCoords[] = {
(v100 * 4.f) / 64, 7.f / 8,
(v100 * 4.f) / 64, 0.0f,
@ -212,23 +186,6 @@ FPSState::DrawFPS(TimeStamp aNow,
(v1 * 4.f + 4) / 64, 0.0f,
};
const GLfloat texCoords2[] = {
(txn100 * 4.f) / 64, 7.f / 8,
(txn100 * 4.f) / 64, 0.0f,
(txn100 * 4.f + 4) / 64, 7.f / 8,
(txn100 * 4.f + 4) / 64, 0.0f,
(txn10 * 4.f) / 64, 7.f / 8,
(txn10 * 4.f) / 64, 0.0f,
(txn10 * 4.f + 4) / 64, 7.f / 8,
(txn10 * 4.f + 4) / 64, 0.0f,
(txn1 * 4.f) / 64, 7.f / 8,
(txn1 * 4.f) / 64, 0.0f,
(txn1 * 4.f + 4) / 64, 7.f / 8,
(txn1 * 4.f + 4) / 64, 0.0f,
};
// Turn necessary features on
context->fEnable(LOCAL_GL_BLEND);
context->fBlendFunc(LOCAL_GL_ONE, LOCAL_GL_SRC_COLOR);
@ -250,10 +207,21 @@ FPSState::DrawFPS(TimeStamp aNow,
LOCAL_GL_TRIANGLE_STRIP, 12,
vcattr, (GLfloat *) vertices,
tcattr, (GLfloat *) texCoords);
DrawWithVertexBuffer2(context, mVBOs,
LOCAL_GL_TRIANGLE_STRIP, 12,
vcattr, (GLfloat *) vertices2,
tcattr, (GLfloat *) texCoords2);
}
void
FPSState::DrawFPS(TimeStamp aNow,
unsigned aFillRatio,
GLContext* context, ShaderProgramOGL* copyprog)
{
mVBOs.Reset();
unsigned fps = unsigned(mCompositionFps.AddFrameAndGetFps(aNow));
unsigned txnFps = unsigned(mTransactionFps.GetFpsAt(aNow));
DrawCounter(0, fps, context, copyprog);
DrawCounter(80, txnFps, context, copyprog);
DrawCounter(160, aFillRatio, context, copyprog);
}
#ifdef CHECK_CURRENT_PROGRAM
@ -829,6 +797,9 @@ CompositorOGL::BeginFrame(const Rect *aClipRectIn, const gfxMatrix& aTransform,
MakeCurrent();
}
mPixelsPerFrame = width * height;
mPixelsFilled = 0;
#if MOZ_ANDROID_OMTC
TexturePoolOGL::Fill(gl());
#endif
@ -1053,6 +1024,8 @@ CompositorOGL::DrawQuad(const Rect& aRect, const Rect& aClipRect,
maskType = MaskNone;
}
mPixelsFilled += aRect.width * aRect.height;
ShaderProgramType programType = GetProgramTypeForEffect(aEffectChain.mPrimaryEffect);
ShaderProgramOGL *program = GetProgram(programType, maskType);
program->Activate();
@ -1314,7 +1287,13 @@ CompositorOGL::EndFrame()
}
if (mFPS) {
mFPS->DrawFPS(TimeStamp::Now(), mGLContext, GetProgram(Copy2DProgramType));
double fillRatio = 0;
if (mPixelsFilled > 0.0f && mPixelsPerFrame > 0.0f) {
fillRatio = 100.0f * double(mPixelsFilled) / double(mPixelsPerFrame);
if (fillRatio > 999.0f)
fillRatio = 999.0f;
}
mFPS->DrawFPS(TimeStamp::Now(), unsigned(fillRatio), mGLContext, GetProgram(Copy2DProgramType));
}
mGLContext->SwapBuffers();

3
gfx/layers/opengl/FPSCounter.h
Просмотреть файл

@ -75,7 +75,8 @@ struct FPSState {
FPSState() : mTexture(0) { }
void DrawFPS(TimeStamp, gl::GLContext*, ShaderProgramOGL*);
void DrawCounter(float, unsigned, gl::GLContext*, ShaderProgramOGL*);
void DrawFPS(TimeStamp, unsigned, gl::GLContext*, ShaderProgramOGL*);
void NotifyShadowTreeTransaction() {
mTransactionFps.AddFrame(TimeStamp::Now());

2
gfx/layers/opengl/LayerManagerOGL.cpp
Просмотреть файл

@ -896,7 +896,7 @@ LayerManagerOGL::Render()
}
if (mFPS) {
mFPS->DrawFPS(TimeStamp::Now(), mGLContext, GetProgram(Copy2DProgramType));
mFPS->DrawFPS(TimeStamp::Now(), 0, mGLContext, GetProgram(Copy2DProgramType));
}
if (mGLContext->IsDoubleBuffered()) {