Merge pull request #6 from rajdakin/generalImprovements

General improvements to box64 and fixed some SDL2 functions

2 files changed, 4 insertions, 8 deletions

diff --git a/src/include/box64context.h b/src/include/box64context.h
index 4d48c816..1b215378 100755
--- a/src/include/box64context.h
+++ b/src/include/box64context.h
@@ -31,7 +31,6 @@ typedef struct kh_dynablocks_s  kh_dynablocks_t;
 #define JMPTABL_SHIFT 16
 
 typedef void* (*procaddess_t)(const char* name);
-typedef void* (*vkprocaddess_t)(void* instance, const char* name);
 
 #define MAX_SIGNAL 64
 
@@ -108,9 +107,6 @@ typedef struct box64context_s {
     procaddess_t        glxprocaddress;
     kh_symbolmap_t      *alwrappers;    // the map of wrapper for alGetProcAddress
     kh_symbolmap_t      *almymap;       // link to the mysymbolmap if libOpenAL
-    kh_symbolmap_t      *vkwrappers;    // the map of wrapper for VulkanProcs (TODO: check SDL2)
-    kh_symbolmap_t      *vkmymap;       // link to the mysymbolmap of libGL
-    vkprocaddess_t      vkprocaddress;
 
     pthread_mutex_t     mutex_once;
     pthread_mutex_t     mutex_once2;
diff --git a/src/include/sdl2rwops.h b/src/include/sdl2rwops.h
index 968a3c58..a049f80b 100755
--- a/src/include/sdl2rwops.h
+++ b/src/include/sdl2rwops.h
@@ -1,7 +1,7 @@
 #ifndef __SDL2RWOPS_H__
 #define __SDL2RWOPS_H__
 
-typedef struct SDL2_RWops_s SDL2_RWops_t;   // the actual SDL1 SDL_RWops
+typedef struct SDL2_RWops_s SDL2_RWops_t;   // the actual SDL2 SDL_RWops
 typedef struct x64emu_s x64emu_t;
 
 typedef SDL2_RWops_t* (*sdl2_allocrw)();
@@ -20,12 +20,12 @@ typedef struct SDL2RWSave_s {
 
 // each function will be added to dictionary, and each native functions will be wrapped so they run in emulated world
 SDL2_RWops_t* AddNativeRW2(x64emu_t* emu, SDL2_RWops_t* ops);
-SDL2_RWops_t* RWNativeStart2(x64emu_t* emu, SDL2_RWops_t* ops);   // put Native RW function, wrapping emulated (callback style) ones if needed
-void RWNativeEnd2(SDL2_RWops_t* ops);     // put back emulated function back in place
+SDL2_RWops_t* RWNativeStart2(x64emu_t* emu, SDL2_RWops_t* ops); // put native RW functions, wrapping the emulated (callback style) ones if needed
+void RWNativeEnd2(SDL2_RWops_t* ops);                           // put emulated function back in place
 
 int64_t RWNativeSeek2(SDL2_RWops_t *ops, int64_t offset, int32_t whence);
 uint32_t RWNativeRead2(SDL2_RWops_t* ops, void* ptr, uint32_t size, uint32_t maxnum);
 int32_t RWNativeWrite2(SDL2_RWops_t *ops, const void *ptr, int32_t size, int32_t num);
 int32_t RWNativeClose2(SDL2_RWops_t* ops);
 
-#endif
\ No newline at end of file
+#endif