1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve vobject error messages (#106)

Browse Source 
Error messages will now print the video object's file name when throwing the error, giving us an immediate starting point for debugging. Especially useful when those intermittent assertion errors happen.
This commit is contained in:
Asdow
2023-01-21 17:01:35 +02:00
committed by GitHub
parent 1770f7f081
commit 8733c2c2eb
2 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Standard Gaming Platform/vobject.cpp
+28 -19
View File
@@ -1,12 +1,12 @@
#include "DirectDraw Calls.h" #include "DirectDraw Calls.h"
#include <stdio.h> #include <stdio.h>
#include "debug.h" #include "debug.h"
#include "video.h" #include "video.h"
#include "himage.h" #include "himage.h"
#include "vobject.h" #include "vobject.h"
#include "wcheck.h" #include "wcheck.h"
#include "vobject_blitters.h" #include "vobject_blitters.h"
#include "sgp.h" #include "sgp.h"
#include <unordered_map> #include <unordered_map>
@@ -589,6 +589,7 @@ HVOBJECT CreateVideoObject( VOBJECT_DESC *VObjectDesc )
hVObject->usNumberOf16BPPObjects = 1; hVObject->usNumberOf16BPPObjects = 1;
hVObject->ubBitDepth = hImage->ubBitDepth; hVObject->ubBitDepth = hImage->ubBitDepth;
strncpy(hVObject->ImageFile, hImage->ImageFile, SGPFILENAME_LEN);
if ( VObjectDesc->fCreateFlags & VOBJECT_CREATE_FROMFILE ) if ( VObjectDesc->fCreateFlags & VOBJECT_CREATE_FROMFILE )
{ {
@@ -627,6 +628,7 @@ HVOBJECT CreateVideoObject( VOBJECT_DESC *VObjectDesc )
hVObject->usNumberOf16BPPObjects = 1; hVObject->usNumberOf16BPPObjects = 1;
hVObject->ubBitDepth = hImage->ubBitDepth; hVObject->ubBitDepth = hImage->ubBitDepth;
strncpy(hVObject->ImageFile, hImage->ImageFile, SGPFILENAME_LEN);
if ( VObjectDesc->fCreateFlags & VOBJECT_CREATE_FROMFILE ) if ( VObjectDesc->fCreateFlags & VOBJECT_CREATE_FROMFILE )
{ {
@@ -656,6 +658,7 @@ HVOBJECT CreateVideoObject( VOBJECT_DESC *VObjectDesc )
hVObject->pETRLEObject = TempETRLEData.pETRLEObject; hVObject->pETRLEObject = TempETRLEData.pETRLEObject;
hVObject->pPixData = TempETRLEData.pPixData; hVObject->pPixData = TempETRLEData.pPixData;
hVObject->uiSizePixData = TempETRLEData.uiSizePixData; hVObject->uiSizePixData = TempETRLEData.uiSizePixData;
strncpy(hVObject->ImageFile, hImage->ImageFile, SGPFILENAME_LEN);
// Set palette from himage // Set palette from himage
if ( hImage->ubBitDepth == 8 ) if ( hImage->ubBitDepth == 8 )
@@ -897,9 +900,10 @@ UINT32 count;
// //
// ******************************************************************* // *******************************************************************
// High level blit function encapsolates ALL effects and BPP // High level blit function encapsulates ALL effects and BPP
BOOLEAN BltVideoObjectToBuffer( UINT16 *pBuffer, UINT32 uiDestPitchBYTES, HVOBJECT hSrcVObject, UINT16 usIndex, INT32 iDestX, INT32 iDestY, INT32 fBltFlags, blt_fx *pBltFx ) BOOLEAN BltVideoObjectToBuffer( UINT16 *pBuffer, UINT32 uiDestPitchBYTES, HVOBJECT hSrcVObject, UINT16 usIndex, INT32 iDestX, INT32 iDestY, INT32 fBltFlags, blt_fx *pBltFx )
{ {
CHAR8 errorText[512];
// Sometimes an exception is thrown in that method. // Sometimes an exception is thrown in that method.
//BF __try //BF __try
{ {
@@ -920,7 +924,8 @@ BOOLEAN BltVideoObjectToBuffer( UINT16 *pBuffer, UINT32 uiDestPitchBYTES, HVOBJE
switch( hSrcVObject->ubBitDepth ) switch( hSrcVObject->ubBitDepth )
{ {
case 32: case 32:
SGP_THROW_IFFALSE(usIndex < hSrcVObject->usNumberOf16BPPObjects, L"index larger that number images"); sprintf(errorText, "Video object index is larger than the number of images. Filename: %s", hSrcVObject->ImageFile);
SGP_THROW_IFFALSE(usIndex < hSrcVObject->usNumberOf16BPPObjects, errorText);
image = &hSrcVObject->p16BPPObject[usIndex]; image = &hSrcVObject->p16BPPObject[usIndex];
Blt32BPPTo16BPPTrans( pBuffer, uiDestPitchBYTES, Blt32BPPTo16BPPTrans( pBuffer, uiDestPitchBYTES,
(UINT32*)image->p16BPPData, image->usWidth * sizeof(UINT32), (UINT32*)image->p16BPPData, image->usWidth * sizeof(UINT32),
@@ -929,7 +934,8 @@ BOOLEAN BltVideoObjectToBuffer( UINT16 *pBuffer, UINT32 uiDestPitchBYTES, HVOBJE
break; break;
case 16: case 16:
SGP_THROW_IFFALSE(usIndex < hSrcVObject->usNumberOf16BPPObjects, L"index larger that number images"); sprintf(errorText, "Video object index is larger than the number of images. Filename: %s", hSrcVObject->ImageFile);
SGP_THROW_IFFALSE(usIndex < hSrcVObject->usNumberOf16BPPObjects, errorText);
image = &hSrcVObject->p16BPPObject[usIndex]; image = &hSrcVObject->p16BPPObject[usIndex];
if ( fBltFlags & VO_BLT_SRCTRANSPARENCY ) if ( fBltFlags & VO_BLT_SRCTRANSPARENCY )
{ {
@@ -949,8 +955,8 @@ BOOLEAN BltVideoObjectToBuffer( UINT16 *pBuffer, UINT32 uiDestPitchBYTES, HVOBJE
break; break;
case 8: case 8:
sprintf(errorText, "Video object index is larger than the number of sub images. Filename: %s", hSrcVObject->ImageFile);
SGP_THROW_IFFALSE( hSrcVObject->usNumberOfObjects > usIndex, L"Video object index is larger than the number of subimages"); SGP_THROW_IFFALSE( hSrcVObject->usNumberOfObjects > usIndex, errorText);
// Switch based on flags given // Switch based on flags given
do do
{ {
@@ -1561,9 +1567,10 @@ BOOLEAN BltVideoObjectOutline(UINT32 uiDestVSurface, HVOBJECT hSrcVObject, UINT1
BOOLEAN BltVideoObjectOutlineShadowFromIndex(UINT32 uiDestVSurface, UINT32 uiSrcVObject, UINT16 usIndex, INT32 iDestX, INT32 iDestY ) BOOLEAN BltVideoObjectOutlineShadowFromIndex(UINT32 uiDestVSurface, UINT32 uiSrcVObject, UINT16 usIndex, INT32 iDestX, INT32 iDestY )
{ {
UINT16 *pBuffer; CHAR8 errorText[512];
UINT32 uiPitch; UINT16 *pBuffer;
HVOBJECT hSrcVObject; UINT32 uiPitch;
HVOBJECT hSrcVObject;
// Lock video surface // Lock video surface
pBuffer = (UINT16*)LockVideoSurface( uiDestVSurface, &uiPitch ); pBuffer = (UINT16*)LockVideoSurface( uiDestVSurface, &uiPitch );
@@ -1592,14 +1599,16 @@ BOOLEAN BltVideoObjectOutlineShadowFromIndex(UINT32 uiDestVSurface, UINT32 uiSrc
} }
else if(hSrcVObject->ubBitDepth == 16) else if(hSrcVObject->ubBitDepth == 16)
{ {
SGP_THROW_IFFALSE(usIndex < hSrcVObject->usNumberOf16BPPObjects, L"index larger that number images"); sprintf(errorText, "Video object index is larger than the number of images. Filename: %s", hSrcVObject->ImageFile);
SGP_THROW_IFFALSE(usIndex < hSrcVObject->usNumberOf16BPPObjects, errorText);
SixteenBPPObjectInfo &image = hSrcVObject->p16BPPObject[0]; SixteenBPPObjectInfo &image = hSrcVObject->p16BPPObject[0];
Blt16BPPTo16BPPTransShadow(pBuffer, uiPitch, image.p16BPPData, image.usWidth * sizeof(UINT16), Blt16BPPTo16BPPTransShadow(pBuffer, uiPitch, image.p16BPPData, image.usWidth * sizeof(UINT16),
iDestX, iDestY, 0, 0, image.usWidth, image.usHeight, 0x1F); iDestX, iDestY, 0, 0, image.usWidth, image.usHeight, 0x1F);
} }
else if(hSrcVObject->ubBitDepth == 32) else if(hSrcVObject->ubBitDepth == 32)
{ {
SGP_THROW_IFFALSE(usIndex < hSrcVObject->usNumberOf16BPPObjects, L"index larger that number images"); sprintf(errorText, "Video object index is larger than the number of images. Filename: %s", hSrcVObject->ImageFile);
SGP_THROW_IFFALSE(usIndex < hSrcVObject->usNumberOf16BPPObjects, errorText);
SixteenBPPObjectInfo &image = hSrcVObject->p16BPPObject[0]; SixteenBPPObjectInfo &image = hSrcVObject->p16BPPObject[0];
Blt32BPPTo16BPPTransShadow(pBuffer, uiPitch, (UINT32*)image.p16BPPData, image.usWidth * sizeof(UINT32), Blt32BPPTo16BPPTransShadow(pBuffer, uiPitch, (UINT32*)image.p16BPPData, image.usWidth * sizeof(UINT32),
iDestX, iDestY, 0, 0, image.usWidth, image.usHeight); iDestX, iDestY, 0, 0, image.usWidth, image.usHeight);
Standard Gaming Platform/vobject.h
+17 -21
View File
@@ -84,30 +84,26 @@ typedef struct
// The video object contains different data based on it's type, compressed or not // The video object contains different data based on it's type, compressed or not
typedef struct TAG_HVOBJECT typedef struct TAG_HVOBJECT
{ {
UINT32 fFlags; // Special flags UINT32 fFlags; // Special flags
UINT32 uiSizePixData; // ETRLE data size UINT32 uiSizePixData; // ETRLE data size
SGPPaletteEntry *pPaletteEntry; // 8BPP Palette SGPPaletteEntry *pPaletteEntry; // 8BPP Palette
COLORVAL TransparentColor; // Defaults to 0,0,0 COLORVAL TransparentColor; // Defaults to 0,0,0
UINT16 *p16BPPPalette; // A 16BPP palette used for 8->16 blits UINT16 *p16BPPPalette; // A 16BPP palette used for 8->16 blits
PTR pPixData; // ETRLE pixel data PTR pPixData; // ETRLE pixel data
ETRLEObject *pETRLEObject; // Object offset data etc ETRLEObject *pETRLEObject; // Object offset data etc
SixteenBPPObjectInfo *p16BPPObject; SixteenBPPObjectInfo *p16BPPObject;
UINT16 *pShades[HVOBJECT_SHADE_TABLES]; // Shading tables UINT16 *pShades[HVOBJECT_SHADE_TABLES]; // Shading tables
UINT16 *pShadeCurrent; UINT16 *pShadeCurrent;
UINT16 *pGlow; // glow highlight table UINT16 *pGlow; // glow highlight table
UINT8 *pShade8; // 8-bit shading index table UINT8 *pShade8; // 8-bit shading index table
UINT8 *pGlow8; // 8-bit glow table UINT8 *pGlow8; // 8-bit glow table
ZStripInfo **ppZStripInfo; // Z-value strip info arrays ZStripInfo **ppZStripInfo; // Z-value strip info arrays
UINT16 usNumberOf16BPPObjects;
UINT16 usNumberOfObjects; // Total number of objects
UINT8 ubBitDepth; // BPP
// Reserved for added room and 32-byte boundaries
BYTE bReserved[ 1 ];
UINT16 usNumberOf16BPPObjects;
UINT16 usNumberOfObjects; // Total number of objects
UINT8 ubBitDepth; // BPP
SGPFILENAME ImageFile;
} SGPVObject, *HVOBJECT; } SGPVObject, *HVOBJECT;