From 888edfd5b8ea15f513b978773b7e968e857cb3a3 Mon Sep 17 00:00:00 2001 From: "wagic.the.homebrew@gmail.com" Date: Sat, 3 Oct 2009 08:50:44 +0000 Subject: [PATCH] Erwan -more JGE cleanup -removed calls to BindTexture that were made out of the Render methods. Please let me know if this has side effects (and let's discuss it in that case) -Still no luck with the purple screen bug :( --- JGE/include/JRenderer.h | 9 +- JGE/include/JTypes.h | 3 - JGE/src/JGfx.cpp | 174 ++++++-------------------- JGE/src/JMD2Model.cpp | 25 ---- JGE/src/linux/JGfx.cpp | 29 ----- JGE/src/main.cpp | 54 +------- JGE/src/win/JRenderer_Win.cpp | 6 - projects/mtg/src/OptionItem.cpp | 2 - projects/mtg/src/WResourceManager.cpp | 2 - 9 files changed, 38 insertions(+), 266 deletions(-) diff --git a/JGE/include/JRenderer.h b/JGE/include/JRenderer.h index 588e167d6..1d74a1184 100644 --- a/JGE/include/JRenderer.h +++ b/JGE/include/JRenderer.h @@ -160,12 +160,6 @@ public: ////////////////////////////////////////////////////////////////////////// void EnableTextureFilter(bool flag); - ////////////////////////////////////////////////////////////////////////// - /// Remove all textures from VRAM (PSP only) - /// - ////////////////////////////////////////////////////////////////////////// - void ResetPrivateVRAM(); - ////////////////////////////////////////////////////////////////////////// /// Enable/disable swizzle optimization. (PSP only) /// @@ -546,15 +540,14 @@ private: int mCurrentTex; int mCurrentBlend; int mCurrentTextureFormat; - int PixelSize(int textureMode); - #endif bool mVsync; int mSwizzle; int mTexCounter; + int mCurrentTextureFilter; diff --git a/JGE/include/JTypes.h b/JGE/include/JTypes.h index 1270800a1..fc1605452 100644 --- a/JGE/include/JTypes.h +++ b/JGE/include/JTypes.h @@ -220,8 +220,6 @@ typedef uint32_t u32; typedef struct { ScePspFVector2 texture; - //PIXEL_TYPE color; - //ScePspFVector3 normal; ScePspFVector3 pos; } PSPVertex3D; @@ -244,7 +242,6 @@ struct Vertex struct Vertex3D { float u, v; - //float nx, ny, nz; float x, y, z; }; diff --git a/JGE/src/JGfx.cpp b/JGE/src/JGfx.cpp index 2a6830d91..7860dac86 100644 --- a/JGE/src/JGfx.cpp +++ b/JGE/src/JGfx.cpp @@ -164,11 +164,6 @@ JRenderer::~JRenderer() } -void JRenderer::ResetPrivateVRAM() -{ -} - - void JRenderer::InitRenderer() { @@ -270,9 +265,9 @@ void JRenderer::InitRenderer() } - void JRenderer::SetTexBlend(int src, int dest) { + if (src != mCurrTexBlendSrc || dest != mCurrTexBlendDest) { mCurrTexBlendSrc = src; @@ -307,12 +302,6 @@ void JRenderer::EnableTextureFilter(bool flag) mCurrentTextureFilter = TEX_FILTER_LINEAR; else mCurrentTextureFilter = TEX_FILTER_NEAREST; - -// if (flag) -// sceGuTexFilter(GU_LINEAR, GU_LINEAR); -// else -// sceGuTexFilter(GU_NEAREST, GU_NEAREST); - } @@ -324,7 +313,6 @@ void JRenderer::DestroyRenderer() void JRenderer::BeginScene() { - //sceKernelDcacheWritebackInvalidateAll(); sceGuStart(GU_DIRECT, list); if (m3DEnabled) @@ -333,8 +321,8 @@ void JRenderer::BeginScene() sceGuClear(GU_DEPTH_BUFFER_BIT|GU_COLOR_BUFFER_BIT); } - sceGuTexMode(TEXTURE_FORMAT, 0, 0, mSwizzle); + mCurrentTextureFormat = TEXTURE_FORMAT; if (mCurrentTextureFilter == TEX_FILTER_NEAREST) sceGuTexFilter(GU_NEAREST, GU_NEAREST); // GU_NEAREST good for tile-map @@ -347,6 +335,7 @@ void JRenderer::BeginScene() void JRenderer::EndScene() { sceGuFinish(); + sceGuSync(0,0); if (mVsync) @@ -749,14 +738,6 @@ void JRenderer::RenderQuad(JQuad* quad, VertexColor* points) vertices[3].u = quad->mX + quad->mWidth; vertices[3].v = quad->mY + quad->mHeight; -// for (int i=0;i<4;i++) -// { -// vertices[i].color = points[i].color; -// vertices[i].x = points[i].x; -// vertices[i].y = points[i].y; -// vertices[i].z = points[i].z; -// } - vertices[0].color = points[3].color; vertices[0].x = points[3].x; vertices[0].y = points[3].y; @@ -965,13 +946,11 @@ static void jpeg_mem_src(j_decompress_ptr cinfo, u8 *mem, int len) int JRenderer::PixelSize(int textureMode){ switch (textureMode) { - case PSP_DISPLAY_PIXEL_FORMAT_565: - return 2; - case PSP_DISPLAY_PIXEL_FORMAT_5551: - return 2; - case PSP_DISPLAY_PIXEL_FORMAT_4444: + case GU_PSM_5650: + case GU_PSM_5551: + case GU_PSM_4444: return 2; - case PSP_DISPLAY_PIXEL_FORMAT_8888: + case GU_PSM_8888: return 4; } return PIXEL_SIZE; @@ -999,19 +978,6 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode bits16 = NULL; bits32 = NULL; - /* - FILE * fp = fopen(filenamenew, "rb"); - if (fp==NULL) - return; - - - cinfo.err = jpeg_std_error(&jerr); - jpeg_create_decompress(&cinfo); - - jpeg_stdio_src(&cinfo, fp); -*/ - - JFileSystem* fileSystem = JFileSystem::GetInstance(); if (!fileSystem->OpenFile(filename)) { @@ -1031,12 +997,6 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode fileSystem->ReadFile(rawdata, rawsize); fileSystem->CloseFile(); - /* if (rawdata[6] != 'J' || rawdata[7] != 'F' || rawdata[8] != 'I' || rawdata[9] != 'F') - { - delete [] rawdata; - return; - } */ - cinfo.err = jpeg_std_error(&jerr); jpeg_create_decompress(&cinfo); @@ -1062,10 +1022,9 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode int size = tw * th * pixelSize; - if (useVideoRAM)// && (mCurrentPointer+size)<0x200000) + if (useVideoRAM) { - //bits = (PIXEL_TYPE*) (0x04000000+0x40000000+mCurrentPointer); - //mCurrentPointer += size; + if (pixelSize == 2){ bits16 = (u16*)valloc(size); }else{ @@ -1085,19 +1044,17 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode } } - //rgbadata = (u8 *)bits; + rgbadata16 = bits16; rgbadata32 = bits32; if (mSwizzle) { - //rgbadata = (u8 *) memalign(16, size); if (rgbadata16) rgbadata16 = (u16*) memalign(16, size); if (rgbadata32) rgbadata32 = (u32*) memalign(16, size); if(!rgbadata16 && !rgbadata32) { jpeg_destroy_decompress(&cinfo); if (videoRAMUsed){ - //mCurrentPointer -= size; if (bits16) vfree(bits16); if (bits32) vfree(bits32); }else{ @@ -1146,27 +1103,23 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode int g = p[1]; int b = p[2]; switch (textureMode) { - case PSP_DISPLAY_PIXEL_FORMAT_565: + case GU_PSM_5650: color16 = (r >> 3) | ((g >> 2) << 5) | ((b >> 3) << 11); *(q16) = color16; break; - case PSP_DISPLAY_PIXEL_FORMAT_5551: + case GU_PSM_5551: color16 = (r >> 3) | ((g >> 3) << 5) | ((b >> 3) << 10) | ((a >> 7) << 15); *(q16) = color16; break; - case PSP_DISPLAY_PIXEL_FORMAT_4444: + case GU_PSM_4444: color16 = (r >> 4) | ((g >> 4) << 4) | ((b >> 4) << 8) | ((a >> 4) << 12); *(q16) = color16; break; - case PSP_DISPLAY_PIXEL_FORMAT_8888: + case GU_PSM_8888: color32 = r | (g << 8) | (b << 16) | (a << 24); *(q32) = color32; break; } - //q[0] = p[0]; - //q[1] = p[1]; - //q[2] = p[2]; - //q[3] = 255; p+=3; if (q16) q16+=1; @@ -1183,7 +1136,6 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode }catch(...){} - if (mSwizzle) { if (rgbadata16){ @@ -1207,7 +1159,6 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode textureInfo.mVRAM =videoRAMUsed; jpeg_destroy_decompress(&cinfo); -// fclose(fp); delete [] rawdata; } @@ -1220,10 +1171,14 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int textureMode if (strstr(filename, ".jpg")!=NULL || strstr(filename, ".JPG")!=NULL) LoadJPG(textureInfo, filename, mode, textureMode); - else if(strstr(filename, ".gif")!=NULL || strstr(filename, ".GIF")!=NULL) + else if(strstr(filename, ".gif")!=NULL || strstr(filename, ".GIF")!=NULL) { + textureMode = TEXTURE_FORMAT; //textureMode not supported in Gif yet LoadGIF(textureInfo,filename, mode, textureMode); - else if(strstr(filename, ".png")!=NULL || strstr(filename, ".PNG")!=NULL) + } + else if(strstr(filename, ".png")!=NULL || strstr(filename, ".PNG")!=NULL) { + textureMode = TEXTURE_FORMAT; //textureMode not supported in PNG yet LoadPNG(textureInfo, filename, mode, textureMode); + } if (textureInfo.mBits == NULL) return NULL; @@ -1251,8 +1206,7 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int textureMode if (!done) { - delete tex; - tex = NULL; + SAFE_DELETE(tex); } return tex; @@ -1286,20 +1240,18 @@ void JRenderer::LoadPNG(TextureInfo &textureInfo, const char* filename, int mode png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (png_ptr == NULL) { - //fclose(fp); fileSystem->CloseFile(); - return; + return; } png_set_error_fn(png_ptr, (png_voidp) NULL, (png_error_ptr) NULL, PNGCustomWarningFn); info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) { - //fclose(fp); fileSystem->CloseFile(); - png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); - return; + png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); + return; } png_init_io(png_ptr, NULL); - png_set_read_fn(png_ptr, (png_voidp)fileSystem, PNGCustomReadDataFn); + png_set_read_fn(png_ptr, (png_voidp)fileSystem, PNGCustomReadDataFn); png_set_sig_bytes(png_ptr, sig_read); png_read_info(png_ptr, info_ptr); @@ -1312,10 +1264,9 @@ void JRenderer::LoadPNG(TextureInfo &textureInfo, const char* filename, int mode png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER); line = (u32*) malloc(width * 4); if (!line) { - //fclose(fp); fileSystem->CloseFile(); - png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); - return; + png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); + return; } int texWidth = getNextPower2(width); @@ -1328,11 +1279,8 @@ void JRenderer::LoadPNG(TextureInfo &textureInfo, const char* filename, int mode { - if (useVideoRAM)// && (mCurrentPointer+size)<0x200000) + if (useVideoRAM) { - //bits = (PIXEL_TYPE*) (0x04000000+0x40000000+mCurrentPointer); - //mCurrentPointer += size; - bits = (PIXEL_TYPE*) valloc(size); videoRAMUsed = true; } @@ -1420,7 +1368,6 @@ void JRenderer::LoadPNG(TextureInfo &textureInfo, const char* filename, int mode textureInfo.mBits = NULL; if (videoRAMUsed) - //mCurrentPointer -= size; vfree(bits); else free(bits); @@ -1550,9 +1497,6 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg { DWORD color32 = gif_color32(LineIn[j]); - //if(mTexLoadingCB) mTexLoadingCB(color32); - //if(JRenderer::GetInstance()->GetTextureLoadingCallback()) - //JRenderer::GetInstance()->GetTextureLoadingCallback()(color32); *imgdata++ = color32; } @@ -1594,7 +1538,6 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg if(textureInfo.mBits != NULL) { if (videoRAMUsed) - //mCurrentPointer -= size; vfree(textureInfo.mBits); else free((void *)textureInfo.mBits); @@ -1624,10 +1567,8 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg int image_gif_read(GifFileType * ft, GifByteType * buf, int size) { - //return fread(buf, 1, size, (FILE *)ft->UserData); JFileSystem *fileSys = (JFileSystem *)ft->UserData; - //return fread(buf, 1, size, (FILE *)ft->UserData); if (fileSys->ReadFile(buf, size)) return size; else @@ -1638,12 +1579,7 @@ int image_gif_read(GifFileType * ft, GifByteType * buf, int size) void JRenderer::LoadGIF(TextureInfo &textureInfo, const char *filename, int mode, int textureMode) { textureInfo.mBits = NULL; - //bool useVideoRAM = (mode == TEX_TYPE_USE_VRAM); - ///* - //FILE * fp = fopen(filename, "rb"); - //if(fp == NULL) - // return; JFileSystem *fileSys = JFileSystem::GetInstance(); if (!fileSys->OpenFile(filename)) @@ -1651,20 +1587,12 @@ void JRenderer::LoadGIF(TextureInfo &textureInfo, const char *filename, int mode DWORD bkcol; int result = image_readgif(fileSys, textureInfo, &bkcol, image_gif_read, mode); - //---------------------------------------- - // pixel ** image_data=NULL; - - //---------------------------------------- if(result!=0) textureInfo.mBits=NULL; - //textureInfo.mTexWidth = getNextPower2(textureInfo.mWidth); - //textureInfo.mTexHeight = getNextPower2(textureInfo.mHeight); - //fclose(fp); - fileSys->CloseFile(); - return ;//*/ + return ; } @@ -1678,17 +1606,16 @@ JTexture* JRenderer::CreateTexture(int width, int height, int mode) { tex->mWidth = width; tex->mHeight = height; - //tex->mFlip = false; + tex->mTexWidth = getNextPower2(width); tex->mTexHeight = getNextPower2(height); int size = tex->mTexWidth * tex->mTexHeight * sizeof(PIXEL_TYPE); - if (useVideoRAM)// && (mCurrentPointer+size)<0x200000) + if (useVideoRAM) { tex->mInVideoRAM = true; - tex->mBits = (PIXEL_TYPE*) valloc(size);// (0x04000000+0x40000000+mCurrentPointer); - //mCurrentPointer += size; + tex->mBits = (PIXEL_TYPE*) valloc(size); } //else @@ -1706,21 +1633,7 @@ JTexture* JRenderer::CreateTexture(int width, int height, int mode) return tex; } -//------------------------------------------------------------------------------------------------ -// void JRenderer::FreeTexture(JTexture* tex) -// { -// if (tex) -// { -// if (tex->mBits && !tex->mInVideoRAM) -// free(tex->mBits); -// -// delete tex; -// tex = NULL; -// } -// } - -//------------------------------------------------------------------------------------------------ void JRenderer::BindTexture(JTexture *tex) { if (mCurrentTex != tex->mTexId) @@ -1771,11 +1684,6 @@ void JRenderer::SetClip(int x, int y, int width, int height) sceGuScissor(x, y, width, height); } -// void JRenderer::SetLineWidth(float width) -// { -// mLineWidth = width; -// } - void JRenderer::LoadIdentity() { @@ -1841,9 +1749,6 @@ void JRenderer::RenderTriangles(JTexture* texture, Vertex3D *tris, int start, in vertices[n].pos.y = tris[index].y; vertices[n].pos.z = tris[index].z; - //vertices[n].normal.x = tris[index].nx; - //vertices[n].normal.y = tris[index].ny; - //vertices[n].normal.z = tris[index].nz; index++; n++; @@ -1855,9 +1760,6 @@ void JRenderer::RenderTriangles(JTexture* texture, Vertex3D *tris, int start, in vertices[n].pos.y = tris[index].y; vertices[n].pos.z = tris[index].z; - //vertices[n].normal.x = tris[index].nx; - //vertices[n].normal.y = tris[index].ny; - //vertices[n].normal.z = tris[index].nz; index++; n++; @@ -1869,9 +1771,6 @@ void JRenderer::RenderTriangles(JTexture* texture, Vertex3D *tris, int start, in vertices[n].pos.y = tris[index].y; vertices[n].pos.z = tris[index].z; - //vertices[n].normal.x = tris[index].nx; - //vertices[n].normal.y = tris[index].ny; - //vertices[n].normal.z = tris[index].nz; index++; n++; @@ -2027,7 +1926,6 @@ void JRenderer::FillCircle(float x, float y, float radius, PIXEL_TYPE color) void JRenderer::DrawPolygon(float x, float y, float size, int count, float startingAngle, PIXEL_TYPE color) { - float angle = startingAngle*RAD2DEG; float firstAngle = angle; float steps = 360.0f/count; @@ -2062,7 +1960,6 @@ void JRenderer::DrawPolygon(float x, float y, float size, int count, float start void JRenderer::FillPolygon(float x, float y, float size, int count, float startingAngle, PIXEL_TYPE color) { - float angle = startingAngle*RAD2DEG; float firstAngle = angle; float steps = 360.0f/count; @@ -2115,16 +2012,15 @@ void JRenderer::DrawRoundRect( float x1,float y1, float w,float h,float radius,P } else if (i > y2-y1) { - //(i-(y2-y1-radius)) q=(float)sqrt(radius*radius - (i-(y2-y1))*(i-(y2-y1))); nextq=(float)sqrt(radius*radius - (i+1-(y2-y1))*(i+1-(y2-y1))); } if (nextq == q) nextq = q+1; if (i==-radius || i == y2-y1+radius-1){ - JRenderer::GetInstance()->DrawLine(x1+(radius-q),y1+i+radius,x2+q+radius,y1+i+radius,color); + DrawLine(x1+(radius-q),y1+i+radius,x2+q+radius,y1+i+radius,color); }else{ - JRenderer::GetInstance()->DrawLine(x1+(radius-q),y1+i+radius,x1+(radius-nextq),y1+i+radius,color); - JRenderer::GetInstance()->DrawLine(x2+radius+q,y1+i+radius,x2+radius+nextq,y1+i+radius,color); + DrawLine(x1+(radius-q),y1+i+radius,x1+(radius-nextq),y1+i+radius,color); + DrawLine(x2+radius+q,y1+i+radius,x2+radius+nextq,y1+i+radius,color); } } } diff --git a/JGE/src/JMD2Model.cpp b/JGE/src/JMD2Model.cpp index 4509f17be..cb1879117 100644 --- a/JGE/src/JMD2Model.cpp +++ b/JGE/src/JMD2Model.cpp @@ -435,31 +435,6 @@ void JMD2Model::Render() if (mModel == NULL) return; -// int startFrame = mAnimations[mState]->mStartFrame; -// int endFrame = mAnimations[mState]->mEndFrame; -// -// if ( (startFrame < 0) || (endFrame < 0) ) -// return; -// -// if ( (startFrame >= mModel->numFrames) || (endFrame >= mModel->numFrames) ) -// return; - -// if (mModel->interpol >= 1.0) -// { -// mModel->interpol = 0.0f; -// mModel->currentFrame++; -// if (mModel->currentFrame >= endFrame) -// mModel->currentFrame = startFrame; -// -// mModel->nextFrame = mModel->currentFrame + 1; -// -// if (mModel->nextFrame >= endFrame) -// { -// mModel->nextFrame = startFrame; -// CheckNextState(); -// } -// } - pointList = &mModel->pointList[mModel->numPoints*mModel->currentFrame]; nextPointList = &mModel->pointList[mModel->numPoints*mModel->nextFrame]; diff --git a/JGE/src/linux/JGfx.cpp b/JGE/src/linux/JGfx.cpp index e16458cae..d38a8fd36 100644 --- a/JGE/src/linux/JGfx.cpp +++ b/JGE/src/linux/JGfx.cpp @@ -69,13 +69,6 @@ void JQuad::GetTextureRect(float *x, float *y, float *w, float *h) } -// void JQuad::SetColor(JColor color) -// { -// for (int i=0;i<4;i++) -// mColor[i].color = color.color; -// } -// - void JQuad::SetColor(PIXEL_TYPE color) { for (int i=0;i<4;i++) @@ -254,22 +247,6 @@ void JRenderer::RenderQuad(JQuad* quad, float xo, float yo, float angle, float x pt[1] = Vector2D(x+width, y-height); pt[0] = Vector2D(x, y-height); -// if (angle != 0.0f) -// { -// float xx, yy; -// float cosAngle = cosf(angle); -// float sinAngle = sinf(angle); -// for (int i=0;i<4;i++) -// { -// xx = (cosAngle*(pt[i].x-xo) - sinAngle*(pt[i].y-yo) + xo); -// yy = (sinAngle*(pt[i].x-xo) + cosAngle*(pt[i].y-yo) + yo); -// pt[i].x = xx; -// pt[i].y = yy; -// } -// } -// -// for (int i=0;i<4;i++) -// pt[i].y = SCREEN_HEIGHT_F - pt[i].y; Vector2D uv[4]; uv[0] = Vector2D(quad->mTX0, quad->mTY1); @@ -1269,12 +1246,6 @@ void JRenderer::SetTexBlendDest(int dest) } -void JRenderer::ResetPrivateVRAM() -{ - -} - - void JRenderer::Enable2D() { if (mCurrentRenderMode == MODE_2D) diff --git a/JGE/src/main.cpp b/JGE/src/main.cpp index 7da401ecc..e75266b47 100644 --- a/JGE/src/main.cpp +++ b/JGE/src/main.cpp @@ -1,6 +1,3 @@ - - - #include #include #include @@ -18,8 +15,6 @@ #include -//#include - #include "../../JGE/include/JGE.h" #include "../../JGE/include/JApp.h" #include "../../JGE/include/JGameLauncher.h" @@ -39,8 +34,8 @@ #else PSP_MODULE_INFO(JGEApp_Title, 0x1000, 1, 1); -PSP_MAIN_THREAD_ATTR(0); -//PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER); + PSP_MAIN_THREAD_ATTR(0); + #endif @@ -72,7 +67,6 @@ int power_callback(int unknown, int pwrflags, void *common) if (engine != NULL) engine->Pause(); - //sceKernelDelayThread(1000000); } else if ((pwrflags & PSP_POWER_CB_RESUME_COMPLETE) > 0) { @@ -82,35 +76,6 @@ int power_callback(int unknown, int pwrflags, void *common) engine->Resume(); } -// /* check for power switch and suspending as one is manual and the other automatic */ -// if (pwrflags & PSP_POWER_CB_POWER_SWITCH || pwrflags & PSP_POWER_CB_SUSPENDING) -// { -// // suspending -// if (engine != NULL) -// engine->Pause(); -// } -// else if (pwrflags & PSP_POWER_CB_RESUMING) -// { -// // resuming from suspend mode -// -// } -// else if (pwrflags & PSP_POWER_CB_RESUME_COMPLETE) -// { -// // resume complete -// if (engine != NULL) -// engine->Resume(); -// } -// else if (pwrflags & PSP_POWER_CB_STANDBY) -// { -// // entering standby mode -// if (engine != NULL) -// engine->Pause(); -// } -// else -// { -// // unhandled power event -// } -// sceDisplayWaitVblankStart(); return 0; } @@ -133,21 +98,6 @@ int CallbackThread(SceSize args, void *argp) return 0; } -//------------------------------------------------------------------------------------------------ -// static int AudioChannelThread(SceSize args, void *argp) -// { -// while (!done) -// { -// MikMod_Update(); -// // We have to sleep here to allow other threads a chance to process. -// // with no sleep this thread will take over when the output is disabled via MikMod_DisableOutput() -// // co-operative threading sucks bigtime... -// sceKernelDelayThread(1); -// } -// return (0); -// } - -//------------------------------------------------------------------------------------------------ // Sets up the callback thread and returns its thread id int SetupCallbacks(void) { diff --git a/JGE/src/win/JRenderer_Win.cpp b/JGE/src/win/JRenderer_Win.cpp index 207c549b6..425c10c77 100644 --- a/JGE/src/win/JRenderer_Win.cpp +++ b/JGE/src/win/JRenderer_Win.cpp @@ -1312,12 +1312,6 @@ void JRenderer::SetTexBlendDest(int dest) } -void JRenderer::ResetPrivateVRAM() -{ - -} - - void JRenderer::Enable2D() { if (mCurrentRenderMode == MODE_2D) diff --git a/projects/mtg/src/OptionItem.cpp b/projects/mtg/src/OptionItem.cpp index d26070421..fa3b9178a 100644 --- a/projects/mtg/src/OptionItem.cpp +++ b/projects/mtg/src/OptionItem.cpp @@ -218,7 +218,6 @@ void OptionProfile::updateValue(){ } void OptionProfile::populate(){ - JRenderer * renderer = JRenderer::GetInstance(); string temp = options[Options::ACTIVE_PROFILE].str; if (value >= selections.size()){ //TODO fail gracefully. return; @@ -231,7 +230,6 @@ void OptionProfile::populate(){ mAvatarTex = JRenderer::GetInstance()->LoadTexture(options.profileFile("avatar.jpg","",true,true).c_str(), false); if (mAvatarTex){ mAvatar = NEW JQuad(mAvatarTex, 0, 0, 35, 50); - renderer->BindTexture(mAvatarTex); } PlayerData * pdata = NEW PlayerData(app->collection); diff --git a/projects/mtg/src/WResourceManager.cpp b/projects/mtg/src/WResourceManager.cpp index d47a74feb..3cc1d4fd1 100644 --- a/projects/mtg/src/WResourceManager.cpp +++ b/projects/mtg/src/WResourceManager.cpp @@ -414,7 +414,6 @@ JTexture * WResourceManager::RetrieveTexture(string filename, int style, int sub if(res){ //a non-null result will always be good. JTexture * t = res->Actual(); - JRenderer::GetInstance()->BindTexture(t); return t; } #ifdef DEBUG_CACHE @@ -864,7 +863,6 @@ void WResourceManager::Refresh(){ newNames[oldtex] = mapping->first; else{ newNames[newtex] = mapping->first; - JRenderer::GetInstance()->BindTexture(newtex); } oldTextures[oldtex] = newtex;