Small refactoring changes.

This commit is contained in:
Pavel Krajcevski 2013-02-05 21:54:06 -05:00
parent 8ca5d7ac44
commit 8cad373e8e
3 changed files with 35 additions and 23 deletions

View File

@ -70,6 +70,7 @@
// Forward Declarations // Forward Declarations
class BitStream; class BitStream;
struct VisitedState;
const int kMaxEndpoints = 3; const int kMaxEndpoints = 3;
static const int kPBits[4][2] = { static const int kPBits[4][2] = {
@ -213,13 +214,12 @@ private:
} }
} }
double OptimizeEndpointsForCluster(const RGBACluster &cluster, RGBAVector &p1, RGBAVector &p2, int *bestIndices, int &bestPbitCombo) const; double OptimizeEndpointsForCluster(
const RGBACluster &cluster,
struct VisitedState { RGBAVector &p1, RGBAVector &p2,
RGBAVector p1; int *bestIndices,
RGBAVector p2; int &bestPbitCombo
int pBitCombo; ) const;
};
void PickBestNeighboringEndpoints( void PickBestNeighboringEndpoints(
const RGBACluster &cluster, const RGBACluster &cluster,

View File

@ -517,7 +517,19 @@ static void ChangePointForDirWithPbitChange(RGBAVector &v, int dir, int oldPbit,
} }
} }
void BC7CompressionMode::PickBestNeighboringEndpoints(const RGBACluster &cluster, const RGBAVector &p1, const RGBAVector &p2, const int curPbitCombo, RGBAVector &np1, RGBAVector &np2, int &nPbitCombo, const VisitedState *visitedStates, int nVisited, float stepSz) const { struct VisitedState {
RGBAVector p1;
RGBAVector p2;
int pBitCombo;
};
void BC7CompressionMode::PickBestNeighboringEndpoints(
const RGBACluster &cluster,
const RGBAVector &p1, const RGBAVector &p2, const int curPbitCombo,
RGBAVector &np1, RGBAVector &np2, int &nPbitCombo,
const VisitedState *visitedStates, int nVisited,
float stepSz
) const {
// !SPEED! There might be a way to make this faster since we're working // !SPEED! There might be a way to make this faster since we're working
// with floating point values that are powers of two. We should be able // with floating point values that are powers of two. We should be able