Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76322af2 authored by Alex Sakhartchouk's avatar Alex Sakhartchouk
Browse files

Adding average fps counter. 

Removing rsLight from libRS

Change-Id: I8622efd10619dc120d37f3a12122e9c7fc34ff2e
parent cd1b8d36

libs/rs/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ LOCAL_SRC_FILES:= \ 
	rsElement.cpp \

	rsFileA3D.cpp \

	rsFont.cpp \

	rsLight.cpp \

	rsLocklessFifo.cpp \

	rsObjectBase.cpp \

	rsMatrix.cpp \

libs/rs/RenderScript.h

+0 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ typedef void * RsSampler; 
typedef void * RsScript;

typedef void * RsMesh;

typedef void * RsType;

typedef void * RsLight;

typedef void * RsObjectBase;



typedef void * RsProgram;
@@ -242,7 +241,6 @@ enum RsA3DClassID { 
    RS_A3D_CLASS_ID_PROGRAM_STORE,

    RS_A3D_CLASS_ID_SAMPLER,

    RS_A3D_CLASS_ID_ANIMATION,

    RS_A3D_CLASS_ID_LIGHT,

    RS_A3D_CLASS_ID_ADAPTER_1D,

    RS_A3D_CLASS_ID_ADAPTER_2D,

    RS_A3D_CLASS_ID_SCRIPT_C

libs/rs/RenderScriptEnv.h

+0 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ typedef void * RsMesh; 
typedef void * RsType;

typedef void * RsProgramFragment;

typedef void * RsProgramStore;

typedef void * RsLight;





typedef struct {

    float m[16];

libs/rs/rsContext.cpp

+19 −5
Original line number Diff line number Diff line
@@ -188,6 +188,9 @@ void Context::timerInit() 
    mTimeFrame = mTimeLast;

    mTimeLastFrame = mTimeLast;

    mTimerActive = RS_TIMER_INTERNAL;

    mAverageFPSFrameCount = 0;

    mAverageFPSStartTime = mTimeLast;

    mAverageFPS = 0;

    timerReset();

}
@@ -195,6 +198,16 @@ void Context::timerFrame() 
{

    mTimeLastFrame = mTimeFrame;

    mTimeFrame = getTime();

    // Update average fps

    const uint64_t averageFramerateInterval = 1000 * 1000000;

    mAverageFPSFrameCount ++;

    uint64_t inverval = mTimeFrame - mAverageFPSStartTime;

    if(inverval >= averageFramerateInterval) {

        inverval = inverval / 1000000;

        mAverageFPS = (mAverageFPSFrameCount * 1000) / inverval;

        mAverageFPSFrameCount = 0;

        mAverageFPSStartTime = mTimeFrame;

    }

}



void Context::timerSet(Timers tm)
@@ -218,12 +231,13 @@ void Context::timerPrint() 




    if (props.mLogTimes) {

        LOGV("RS: Frame (%i),   Script %2.1f (%i),  Clear & Swap %2.1f (%i),  Idle %2.1f (%lli),  Internal %2.1f (%lli)",

        LOGV("RS: Frame (%i),   Script %2.1f (%i),  Clear & Swap %2.1f (%i),  Idle %2.1f (%lli),  Internal %2.1f (%lli), Avg fps: %u",

             mTimeMSLastFrame,

             100.0 * mTimers[RS_TIMER_SCRIPT] / total, mTimeMSLastScript,

             100.0 * mTimers[RS_TIMER_CLEAR_SWAP] / total, mTimeMSLastSwap,

             100.0 * mTimers[RS_TIMER_IDLE] / total, mTimers[RS_TIMER_IDLE] / 1000000,

             100.0 * mTimers[RS_TIMER_INTERNAL] / total, mTimers[RS_TIMER_INTERNAL] / 1000000);

             100.0 * mTimers[RS_TIMER_INTERNAL] / total, mTimers[RS_TIMER_INTERNAL] / 1000000,

             mAverageFPS);

    }

}
@@ -255,17 +269,17 @@ static bool getProp(const char *str) 
void Context::displayDebugStats()

{

    char buffer[128];

    sprintf(buffer, "Frame %i ms, Script %i ms", mTimeMSLastFrame, mTimeMSLastScript);

    sprintf(buffer, "Avg fps %u, Frame %i ms, Script %i ms", mAverageFPS, mTimeMSLastFrame, mTimeMSLastScript);

    float oldR, oldG, oldB, oldA;

    mStateFont.getFontColor(&oldR, &oldG, &oldB, &oldA);

    uint32_t bufferLen = strlen(buffer);



    float shadowCol = 0.1f;

    mStateFont.setFontColor(shadowCol, shadowCol, shadowCol, 1.0f);

    mStateFont.renderText(buffer, bufferLen, 5, getHeight() - 5);

    mStateFont.renderText(buffer, bufferLen, 5, getHeight() - 6);



    mStateFont.setFontColor(1.0f, 0.7f, 0.0f, 1.0f);

    mStateFont.renderText(buffer, bufferLen, 4, getHeight() - 6);

    mStateFont.renderText(buffer, bufferLen, 4, getHeight() - 7);



    mStateFont.setFontColor(oldR, oldG, oldB, oldA);

}

libs/rs/rsContext.h

+3 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "rsAllocation.h"

#include "rsAdapter.h"

#include "rsSampler.h"

#include "rsLight.h"

#include "rsFont.h"

#include "rsProgramFragment.h"

#include "rsProgramStore.h"
@@ -94,7 +93,6 @@ public: 
    ProgramStoreState mStateFragmentStore;

    ProgramRasterState mStateRaster;

    ProgramVertexState mStateVertex;

    LightState mStateLight;

    VertexArrayState mStateVertexArray;

    FontState mStateFont;
@@ -296,6 +294,9 @@ private: 
    uint32_t mTimeMSLastFrame;

    uint32_t mTimeMSLastScript;

    uint32_t mTimeMSLastSwap;

    uint32_t mAverageFPSFrameCount;

    uint64_t mAverageFPSStartTime;

    uint32_t mAverageFPS;

};



}