Backups/librw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:aap/librw

Browse Source
This commit is contained in:
aap
2020-07-29 00:14:38 +02:00
parent 277355db67 3eedea8285
commit bd0614877f
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
premake5.lua
View File

@ -237,7 +237,7 @@ project "ps2test"
libdirs { "$(PS2SDK)/ee/lib" }
links { "librw" }
-- "c -lc" is a hack because we need -lc twice for some reason
links { "c", "kernel", "mf" }
links { "c -lc", "kernel", "mf" }
--project "ps2rastertest"
-- kind "ConsoleApp"

3
src/charset.cpp
View File

@ -232,4 +232,5 @@ Charset::printBuffered(const char *str, int32 x, int32 y, bool32 hideSpaces)
}
#endif
#endif

2
src/d3d/rwxbox.h
View File

@ -96,7 +96,7 @@ Texture *readNativeTexture(Stream *stream);
void writeNativeTexture(Texture *tex, Stream *stream);
uint32 getSizeNativeTexture(Texture *tex);
enum : uint32 {
enum {
D3DFMT_UNKNOWN = 0xFFFFFFFF,
/* Swizzled formats */

20
src/rwengine.h
View File

@ -210,11 +210,13 @@ namespace null {
void beginUpdate(Camera*);
void endUpdate(Camera*);
void clearCamera(Camera*, RGBA *col, uint32 mode);
void showRaster(Raster*);
void showRaster(Raster*, uint32 flags);
void setRenderState(int32 state, void *value);
void *getRenderState(int32 state);
bool32 rasterRenderFast(Raster *raster, int32 x, int32 y);
Raster *rasterCreate(Raster*);
uint8 *rasterLock(Raster*, int32 level, int32 lockMode);
void rasterUnlock(Raster*, int32 level);
@ -226,17 +228,17 @@ namespace null {
bool32 rasterFromImage(Raster*, Image*);
Image *rasterToImage(Raster*);
void im2DRenderLine(void*, int32, int32, int32);
void im2DRenderTriangle(void*, int32, int32, int32, int32);
void im2DRenderPrimitive(PrimitiveType, void*, int32);
void im2DRenderIndexedPrimitive(PrimitiveType,
void*, int32, void*, int32);
void im2DRenderLine(void*, int32, int32, int32);
void im2DRenderTriangle(void*, int32, int32, int32, int32);
void im2DRenderPrimitive(PrimitiveType, void*, int32);
void im2DRenderIndexedPrimitive(PrimitiveType, void*, int32, void*, int32);
void im3DTransform(void *vertices, int32 numVertices, Matrix *world);
void im3DRenderIndexed(PrimitiveType primType, void *indices, int32 numIndices);
void im3DTransform(void *vertices, int32 numVertices, Matrix *world, uint32 flags);
void im3DRenderPrimitive(PrimitiveType primType);
void im3DRenderIndexedPrimitive(PrimitiveType primType, void *indices, int32 numIndices);
void im3DEnd(void);
int deviceSystem(DeviceReq req, void*);
int deviceSystem(DeviceReq req, void *arg0, int32 n);
extern Device renderdevice;
}