ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename HqBlitter -> QisBlitter

This commit is contained in:
Christian Speckner 2019-12-17 17:11:05 +01:00
parent 032f0b0b7c
commit d9effb80b8
7 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/module.mk
View File

@ -27,7 +27,7 @@ MODULE_OBJS := \
src/common/StaggeredLogger.o \
src/common/repository/KeyValueRepositoryConfigfile.o \
src/common/sdl_blitter/BilinearBlitter.o \
src/common/sdl_blitter/HqBlitter.o \
src/common/sdl_blitter/QisBlitter.o \
src/common/sdl_blitter/BlitterFactory.o \
MODULE_DIRS += \

6
src/common/sdl_blitter/BlitterFactory.cxx
View File

@ -19,7 +19,7 @@
#include "SDL_lib.hxx"
#include "BilinearBlitter.hxx"
#include "HqBlitter.hxx"
#include "QisBlitter.hxx"
unique_ptr<Blitter> BlitterFactory::createBlitter(FrameBufferSDL2& fb, ScalingAlgorithm scaling)
{
@ -35,8 +35,8 @@ unique_ptr<Blitter> BlitterFactory::createBlitter(FrameBufferSDL2& fb, ScalingAl
return make_unique<BilinearBlitter>(fb, true);
case ScalingAlgorithm::quasiInteger:
if (HqBlitter::isSupported(fb))
return make_unique<HqBlitter>(fb);
if (QisBlitter::isSupported(fb))
return make_unique<QisBlitter>(fb);
else
return make_unique<BilinearBlitter>(fb, true);

18
src/common/sdl_blitter/HqBlitter.cxx → src/common/sdl_blitter/QisBlitter.cxx
View File

@ -15,12 +15,12 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include "HqBlitter.hxx"
#include "QisBlitter.hxx"
#include "ThreadDebugging.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
HqBlitter::HqBlitter(FrameBufferSDL2& fb) :
QisBlitter::QisBlitter(FrameBufferSDL2& fb) :
mySrcTexture(nullptr),
myIntermediateTexture(nullptr),
mySecondaryIntermedateTexture(nullptr),
@ -31,13 +31,13 @@ HqBlitter::HqBlitter(FrameBufferSDL2& fb) :
{}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
HqBlitter::~HqBlitter()
QisBlitter::~QisBlitter()
{
free();
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool HqBlitter::isSupported(FrameBufferSDL2 &fb)
bool QisBlitter::isSupported(FrameBufferSDL2 &fb)
{
if (!fb.isInitialized()) throw runtime_error("framebuffer not initialized");
@ -45,7 +45,7 @@ bool HqBlitter::isSupported(FrameBufferSDL2 &fb)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void HqBlitter::reinitialize(
void QisBlitter::reinitialize(
SDL_Rect srcRect,
SDL_Rect destRect,
FBSurface::Attributes attributes,
@ -68,7 +68,7 @@ void HqBlitter::reinitialize(
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void HqBlitter::free()
void QisBlitter::free()
{
if (!myTexturesAreAllocated) {
return;
@ -87,7 +87,7 @@ void HqBlitter::free()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void HqBlitter::blit(SDL_Surface& surface)
void QisBlitter::blit(SDL_Surface& surface)
{
ASSERT_MAIN_THREAD;
@ -109,7 +109,7 @@ void HqBlitter::blit(SDL_Surface& surface)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void HqBlitter::blitToIntermediate()
void QisBlitter::blitToIntermediate()
{
ASSERT_MAIN_THREAD;
@ -126,7 +126,7 @@ void HqBlitter::blitToIntermediate()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void HqBlitter::recreateTexturesIfNecessary()
void QisBlitter::recreateTexturesIfNecessary()
{
if (myTexturesAreAllocated && !myRecreateTextures) {
return;

20
src/common/sdl_blitter/HqBlitter.hxx → src/common/sdl_blitter/QisBlitter.hxx
View File

@ -15,22 +15,22 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#ifndef HQ_BLITTER_HXX
#define HQ_BLITTER_HXX
#ifndef QIS_BLITTER_HXX
#define QIS_BLITTER_HXX
#include "Blitter.hxx"
#include "FrameBufferSDL2.hxx"
#include "SDL_lib.hxx"
class HqBlitter : public Blitter {
class QisBlitter : public Blitter {
public:
explicit HqBlitter(FrameBufferSDL2& fb);
explicit QisBlitter(FrameBufferSDL2& fb);
static bool isSupported(FrameBufferSDL2 &fb);
virtual ~HqBlitter();
virtual ~QisBlitter();
virtual void reinitialize(
SDL_Rect srcRect,
@ -68,13 +68,13 @@ class HqBlitter : public Blitter {
private:
HqBlitter(const HqBlitter&) = delete;
QisBlitter(const QisBlitter&) = delete;
HqBlitter(HqBlitter&&) = delete;
QisBlitter(QisBlitter&&) = delete;
HqBlitter& operator=(const HqBlitter&) = delete;
QisBlitter& operator=(const QisBlitter&) = delete;
HqBlitter& operator=(HqBlitter&&) = delete;
QisBlitter& operator=(QisBlitter&&) = delete;
};
#endif // HQ_BLITTER_CXX
#endif // QIS_BLITTER_HXX

16
src/macos/stella.xcodeproj/project.pbxproj
View File

@ -660,12 +660,12 @@
E08B1C19231FF97B00EEF922 /* BreakpointMap.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E08B1C17231FF97B00EEF922 /* BreakpointMap.hxx */; };
E08D2F3E23089B9B000BD709 /* JoyMap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E08D2F3C23089B9B000BD709 /* JoyMap.cxx */; };
E08D2F3F23089B9B000BD709 /* JoyMap.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E08D2F3D23089B9B000BD709 /* JoyMap.hxx */; };
E08FCD5323A037EB0051F59B /* HqBlitter.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E08FCD4C23A037EB0051F59B /* HqBlitter.cxx */; };
E08FCD5323A037EB0051F59B /* QisBlitter.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E08FCD4C23A037EB0051F59B /* QisBlitter.cxx */; };
E08FCD5423A037EB0051F59B /* BlitterFactory.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E08FCD4D23A037EB0051F59B /* BlitterFactory.cxx */; };
E08FCD5523A037EB0051F59B /* Blitter.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E08FCD4E23A037EB0051F59B /* Blitter.hxx */; };
E08FCD5623A037EB0051F59B /* BilinearBlitter.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E08FCD4F23A037EB0051F59B /* BilinearBlitter.cxx */; };
E08FCD5723A037EB0051F59B /* BilinearBlitter.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E08FCD5023A037EB0051F59B /* BilinearBlitter.hxx */; };
E08FCD5823A037EB0051F59B /* HqBlitter.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E08FCD5123A037EB0051F59B /* HqBlitter.hxx */; };
E08FCD5823A037EB0051F59B /* QisBlitter.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E08FCD5123A037EB0051F59B /* QisBlitter.hxx */; };
E08FCD5923A037EB0051F59B /* BlitterFactory.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E08FCD5223A037EB0051F59B /* BlitterFactory.hxx */; };
E09F413B201E901D004A3391 /* AudioQueue.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E09F4139201E901C004A3391 /* AudioQueue.hxx */; };
E09F413C201E901D004A3391 /* AudioQueue.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E09F413A201E901D004A3391 /* AudioQueue.cxx */; };
@ -1397,12 +1397,12 @@
E08B1C17231FF97B00EEF922 /* BreakpointMap.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = BreakpointMap.hxx; sourceTree = "<group>"; };
E08D2F3C23089B9B000BD709 /* JoyMap.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JoyMap.cxx; sourceTree = "<group>"; };
E08D2F3D23089B9B000BD709 /* JoyMap.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = JoyMap.hxx; sourceTree = "<group>"; };
E08FCD4C23A037EB0051F59B /* HqBlitter.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HqBlitter.cxx; path = sdl_blitter/HqBlitter.cxx; sourceTree = "<group>"; };
E08FCD4C23A037EB0051F59B /* QisBlitter.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = QisBlitter.cxx; path = sdl_blitter/QisBlitter.cxx; sourceTree = "<group>"; };
E08FCD4D23A037EB0051F59B /* BlitterFactory.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BlitterFactory.cxx; path = sdl_blitter/BlitterFactory.cxx; sourceTree = "<group>"; };
E08FCD4E23A037EB0051F59B /* Blitter.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Blitter.hxx; path = sdl_blitter/Blitter.hxx; sourceTree = "<group>"; };
E08FCD4F23A037EB0051F59B /* BilinearBlitter.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BilinearBlitter.cxx; path = sdl_blitter/BilinearBlitter.cxx; sourceTree = "<group>"; };
E08FCD5023A037EB0051F59B /* BilinearBlitter.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = BilinearBlitter.hxx; path = sdl_blitter/BilinearBlitter.hxx; sourceTree = "<group>"; };
E08FCD5123A037EB0051F59B /* HqBlitter.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = HqBlitter.hxx; path = sdl_blitter/HqBlitter.hxx; sourceTree = "<group>"; };
E08FCD5123A037EB0051F59B /* QisBlitter.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = QisBlitter.hxx; path = sdl_blitter/QisBlitter.hxx; sourceTree = "<group>"; };
E08FCD5223A037EB0051F59B /* BlitterFactory.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = BlitterFactory.hxx; path = sdl_blitter/BlitterFactory.hxx; sourceTree = "<group>"; };
E09F4139201E901C004A3391 /* AudioQueue.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = AudioQueue.hxx; sourceTree = "<group>"; };
E09F413A201E901D004A3391 /* AudioQueue.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioQueue.cxx; sourceTree = "<group>"; };
@ -2302,8 +2302,8 @@
E08FCD4E23A037EB0051F59B /* Blitter.hxx */,
E08FCD4D23A037EB0051F59B /* BlitterFactory.cxx */,
E08FCD5223A037EB0051F59B /* BlitterFactory.hxx */,
E08FCD4C23A037EB0051F59B /* HqBlitter.cxx */,
E08FCD5123A037EB0051F59B /* HqBlitter.hxx */,
E08FCD4C23A037EB0051F59B /* QisBlitter.cxx */,
E08FCD5123A037EB0051F59B /* QisBlitter.hxx */,
);
name = sdl_blitter;
sourceTree = "<group>";
@ -2475,7 +2475,7 @@
DCF3A6E81DFC75E3008A8AF3 /* Background.hxx in Headers */,
DC21E5C021CA903E007D0E1A /* OSystemMACOS.hxx in Headers */,
DCFB9FAC1ECA2609004FD69B /* DelayQueueIteratorImpl.hxx in Headers */,
E08FCD5823A037EB0051F59B /* HqBlitter.hxx in Headers */,
E08FCD5823A037EB0051F59B /* QisBlitter.hxx in Headers */,
DCA078351F8C1B04008EFEE5 /* SDL_lib.hxx in Headers */,
DCDA03B11A2009BB00711920 /* CartWD.hxx in Headers */,
2D91745909BA90380026E9FF /* PromptWidget.hxx in Headers */,
@ -2818,7 +2818,7 @@
2D91748609BA90380026E9FF /* CartFE.cxx in Sources */,
2D91748909BA90380026E9FF /* Console.cxx in Sources */,
DC6DC91E205DB879004A5FC3 /* PhysicalJoystick.cxx in Sources */,
E08FCD5323A037EB0051F59B /* HqBlitter.cxx in Sources */,
E08FCD5323A037EB0051F59B /* QisBlitter.cxx in Sources */,
DCCE0355225104BF008C246F /* StellaSettingsDialog.cxx in Sources */,
2D91748A09BA90380026E9FF /* Control.cxx in Sources */,
2D91748C09BA90380026E9FF /* Driving.cxx in Sources */,

6
src/windows/Stella.vcxproj
View File

@ -388,7 +388,7 @@
<ClCompile Include="..\common\RewindManager.cxx" />
<ClCompile Include="..\common\sdl_blitter\BilinearBlitter.cxx" />
<ClCompile Include="..\common\sdl_blitter\BlitterFactory.cxx" />
<ClCompile Include="..\common\sdl_blitter\HqBlitter.cxx" />
<ClCompile Include="..\common\sdl_blitter\QisBlitter.cxx" />
<ClCompile Include="..\common\StaggeredLogger.cxx" />
<ClCompile Include="..\common\StateManager.cxx" />
<ClCompile Include="..\common\ThreadDebugging.cxx" />
@ -1096,7 +1096,7 @@
<ClInclude Include="..\common\sdl_blitter\BilinearBlitter.hxx" />
<ClInclude Include="..\common\sdl_blitter\Blitter.hxx" />
<ClInclude Include="..\common\sdl_blitter\BlitterFactory.hxx" />
<ClInclude Include="..\common\sdl_blitter\HqBlitter.hxx" />
<ClInclude Include="..\common\sdl_blitter\QisBlitter.hxx" />
<ClInclude Include="..\common\StaggeredLogger.hxx" />
<ClInclude Include="..\common\StateManager.hxx" />
<ClInclude Include="..\common\StellaKeys.hxx" />
@ -1421,4 +1421,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

6
src/windows/Stella.vcxproj.filters
View File

@ -990,7 +990,7 @@
<ClCompile Include="..\common\sdl_blitter\BilinearBlitter.cxx">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\common\sdl_blitter\HqBlitter.cxx">
<ClCompile Include="..\common\sdl_blitter\QisBlitter.cxx">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\common\sdl_blitter\BlitterFactory.cxx">
@ -2030,7 +2030,7 @@
<ClInclude Include="..\common\sdl_blitter\Blitter.hxx">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\common\sdl_blitter\HqBlitter.hxx">
<ClInclude Include="..\common\sdl_blitter\QisBlitter.hxx">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\common\sdl_blitter\BlitterFactory.hxx">
@ -2048,4 +2048,4 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>