Skip to content
This repository has been archived by the owner on Dec 31, 2024. It is now read-only.

Commit

Permalink
Update to v2.79
Browse files Browse the repository at this point in the history
  • Loading branch information
@diosg-dege
diosg-dege committed Jun 16, 2022
1 parent 8ee0f21 commit ffda187
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 42 deletions.
Binary file modified dgVoodooAPI/Bin/Release/dgVoodooAPI.dll
View file
Binary file not shown.
Binary file modified dgVoodooAPI/Bin/Spec Release/dgVoodooAPI.dll
View file
Binary file not shown.
Binary file modified dgVoodooAPI/Doc/dgVoodooAPI.chm
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions dgVoodooAPI/Inc/APIDebugObj.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ struct APIDebugObj
{
return infoLevel;
}


WarningLevel inline GetWarningLevel () const
{
return warningLevel;
Expand All @@ -70,7 +70,7 @@ struct APIDebugObj
return errorLevel;
}


UInt32 inline GetMaxTraceLevel () const
{
return maxTraceLevel;
Expand All @@ -88,7 +88,7 @@ struct APIDebugObj
pOutputStream = _pOutputStream;
}


APIDebugObj (InfoLevel _infoLevel, WarningLevel _warningLevel, ErrorLevel _errorLevel,
const char* _pPrefixString, UInt32 _maxTraceLevel, IAPIDataStream* _pOutputStream = NULL):
infoLevel (_infoLevel),
Expand Down
2 changes: 1 addition & 1 deletion dgVoodooAPI/Inc/APIObject.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//
// Contact person: DG
//
// *****************************************************************************
// *****************************************************************************

#ifndef APIOBJECT_HPP
#define APIOBJECT_HPP
Expand Down
2 changes: 1 addition & 1 deletion dgVoodooAPI/Inc/IAPIDataStream.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace dgVoodoo {
class IAPIDataStream
{
public:

enum Origin
{
OSet = 0,
Expand Down
60 changes: 36 additions & 24 deletions dgVoodooAPI/Inc/dgVoodooConfig.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,27 +194,38 @@ struct ConfigGeneralExt
};


UInt32 desktopResWidth;
UInt32 desktopResHeight;
UInt32 desktopRefRateNumerator;
UInt32 desktopRefRateDenominator;
UInt32 desktopBitDepth;
UInt32 deframerSize;
UInt32 imageXScaleFactor;
UInt32 imageYScaleFactor;
UInt32 cursorScaleFactor;
UInt32 displayROIPosX;
UInt32 displayROIPosY;
UInt32 displayROISizeX;
UInt32 displayROISizeY;
Environment environment;
UInt32 windowedAttributes;
UInt32 fullscreenAttributes;
Resampling resampling;
UInt32 fpsLimitNumerator;
UInt32 fpsLimitDenominator;
bool freeMouse;
bool enableGDIHooking;
enum PresentationModel
{
PM_Automatic = 0,
PM_Discard,
PM_Sequential,
PM_FlipDiscard,
PM_FlipSequential
};


UInt32 desktopResWidth;
UInt32 desktopResHeight;
UInt32 desktopRefRateNumerator;
UInt32 desktopRefRateDenominator;
UInt32 desktopBitDepth;
UInt32 deframerSize;
UInt32 imageXScaleFactor;
UInt32 imageYScaleFactor;
UInt32 cursorScaleFactor;
UInt32 displayROIPosX;
UInt32 displayROIPosY;
UInt32 displayROISizeX;
UInt32 displayROISizeY;
Environment environment;
UInt32 windowedAttributes;
UInt32 fullscreenAttributes;
Resampling resampling;
PresentationModel presentationModel;
UInt32 fpsLimitNumerator;
UInt32 fpsLimitDenominator;
bool freeMouse;
bool enableGDIHooking;

ConfigGeneralExt ():
desktopResWidth (0),
Expand All @@ -234,6 +245,7 @@ struct ConfigGeneralExt
windowedAttributes (WA_DefaultAttributes),
fullscreenAttributes (FSA_DefaultAttributes),
resampling (RS_Bilinear),
presentationModel (PM_Automatic),
fpsLimitNumerator (0),
fpsLimitDenominator (0),
freeMouse (false),
Expand Down Expand Up @@ -524,12 +536,12 @@ struct ConfigDirectXExt
UInt32 enumeratedResolutionBitDepths;
UInt32 maxVSConstRegisters;
UInt32 nPatchTesselationLevel;
UInt32 renderingOutputEnablingMask;
bool msD3DDeviceNames;
bool rtTexturesForceScaleAndMSAA;
bool smoothedDepthSampling;
bool deferredScreenModeSwitch;
bool primarySurfaceBatchedUpdate;
bool enableSpecializedShaders;

ConfigDirectXExt () :
adapterIDType (AIDT_Default),
Expand All @@ -546,12 +558,12 @@ struct ConfigDirectXExt
enumeratedResolutionBitDepths (ERBD_All),
maxVSConstRegisters (256),
nPatchTesselationLevel (0),
renderingOutputEnablingMask (0xFFFFFFFF),
msD3DDeviceNames (false),
rtTexturesForceScaleAndMSAA (true),
smoothedDepthSampling (true),
deferredScreenModeSwitch (false),
primarySurfaceBatchedUpdate (false),
enableSpecializedShaders (true)
primarySurfaceBatchedUpdate (false)
{
memset (extraResolutions, 0, sizeof (extraResolutions));
}
Expand Down
Binary file modified dgVoodooAPI/Lib/dgVoodooAPI.lib
View file
Binary file not shown.
24 changes: 12 additions & 12 deletions dgVoodooAPI/SampleApp/SampleApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ static void ConfigFromCustomINIStream (IMainFactory* pFactory)
status = (currentPos >= 0 && currentPos < (Int32) strlen (pStreamData)) ? StatusOk : StatusError;
return status;
}


virtual Status Read (UInt32 count, void* buffer, UInt32* readBytes = NULL) const
{
if (status == IAPIDataStream::StatusOk) {
Expand All @@ -98,8 +98,8 @@ static void ConfigFromCustomINIStream (IMainFactory* pFactory)
}
return status;
}


virtual Status Write (UInt32 /*count*/, void* /*buffer*/, UInt32* /*writtenBytes*/) const
{
// no need to implement
Expand All @@ -124,7 +124,7 @@ static void ConfigFromCustomINIStream (IMainFactory* pFactory)

IConfig* pConfig = pFactory->GetIConfig ();
if (pConfig != NULL) {

// --- Test for a right configuration
{
const char* pStreamData = "version = 0x255\n"\
Expand Down Expand Up @@ -169,15 +169,15 @@ static void ConfigFromCustomINIStream (IMainFactory* pFactory)
// no need to implement
return StatusError;
}


virtual Status Read (UInt32 count, void* buffer, UInt32* readBytes = NULL) const
{
// no need to implement
return StatusError;
}


virtual Status Write (UInt32 count, void* buffer, UInt32* writtenBytes) const
{
// Ok, it's a lame solution here, serves only demonstrating purposes
Expand Down Expand Up @@ -231,7 +231,7 @@ static void INIPropertySetRead (IMainFactory* pFactory)
if (pParser->Parse ("TestFiles\\INIPropertySet.ini", IIniParser::LowerCase)) {

printf ("INIPropertySet.ini is successfully parsed. Dumping its content:\n\n");

// Dump the property set to the console window
for (UInt32 i = 0; i < pParser->GetNumberOfSections (); i++) {
const char* pSectionName = pParser->GetSectionName (i);
Expand Down Expand Up @@ -286,7 +286,7 @@ static void DumpGraphicsSystemInformation (IMainFactory* pFactory)

pCPLDDI->GetAdapterName (i, adapterName);
printf ("\nAdapter %i: %ls", i, adapterName);

UInt32 numOutputs = pCPLDDI->GetNumberOfOutputs (i);
printf ("\n Number of outputs: %d\n", numOutputs);
for (UInt32 j = 0; j < numOutputs; j++) {
Expand Down Expand Up @@ -322,7 +322,7 @@ int main()
ConfigReadWrite (pFactory);
ConfigFromCustomINIStream (pFactory);
INIPropertySetRead (pFactory);
DumpGraphicsSystemInformation (pFactory);
DumpGraphicsSystemInformation (pFactory);

dgVoodoo_API_Exit ();
}
Expand Down

0 comments on commit ffda187

Please sign in to comment.