X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fengine%2Fe_graphics.pas;h=4612a400e8a0055bfe3d7bf85e45e907a2bd942e;hb=1c7e7630a308e9c9dc03f1e6f3483f9ce8f52618;hp=18f75c44ea3263119bd6bfbb429a614c05060e09;hpb=e452d337f0620b50d8d978b534437b2732134d8f;p=d2df-sdl.git diff --git a/src/engine/e_graphics.pas b/src/engine/e_graphics.pas index 18f75c4..4612a40 100644 --- a/src/engine/e_graphics.pas +++ b/src/engine/e_graphics.pas @@ -381,6 +381,8 @@ end; procedure e_ResizeFramebuffer(Width, Height: Integer); begin + if e_NoGraphics then Exit; + glBindTexture(GL_TEXTURE_2D, 0); glBindRenderbuffer(GL_RENDERBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0); @@ -416,11 +418,11 @@ begin glGenRenderbuffers(1, @e_RBO); glBindRenderbuffer(GL_RENDERBUFFER, e_RBO); - glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, Width, Height); + glRenderbufferStorage(GL_RENDERBUFFER, {$IFNDEF USE_GLES1}GL_DEPTH24_STENCIL8{$ELSE}GL_DEPTH_COMPONENT16{$ENDIF}, Width, Height); glBindFramebuffer(GL_FRAMEBUFFER, e_FBO); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, e_Frame, 0); - glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, e_RBO); + glFramebufferRenderbuffer(GL_FRAMEBUFFER, {$IFNDEF USE_GLES1}GL_DEPTH_STENCIL_ATTACHMENT{$ELSE}GL_DEPTH_ATTACHMENT{$ENDIF}, GL_RENDERBUFFER, e_RBO); end; procedure e_ResizeWindow(Width, Height: Integer); @@ -439,12 +441,6 @@ begin y1 := y0+h; if Mirror = TMirrorType.Horizontal then begin tmp := x1; x1 := x0; x0 := tmp; end else if Mirror = TMirrorType.Vertical then begin tmp := y1; y1 := y0; y0 := tmp; end; - //HACK: make texture one pixel shorter, so it won't wrap - if (g_dbg_scale <> 1.0) then - begin - u := u*tw/(tw+1); - v := v*th/(th+1); - end; glTexCoord2f(0, v); glVertex2i(x0, y0); glTexCoord2f(0, 0); glVertex2i(x0, y1); glTexCoord2f(u, 0); glVertex2i(x1, y1); @@ -453,16 +449,22 @@ end; procedure e_BlitFramebuffer(WinWidth, WinHeight: Integer); begin - if (e_FBO = 0) or (e_Frame = 0) then exit; + if (e_FBO = 0) or (e_Frame = 0) or e_NoGraphics then exit; + glDisable(GL_BLEND); glEnable(GL_TEXTURE_2D); glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindTexture(GL_TEXTURE_2D, e_Frame); - glColor4ub(255, 255, 255, 255); e_SetViewPort(0, 0, WinWidth, WinHeight); + glColor4ub(255, 255, 255, 255); + glBegin(GL_QUADS); - drawTxQuad(0, 0, WinWidth, WinHeight, e_FrameW, e_FrameH, 1, 1, TMirrorType.None); + glTexCoord2f(0, 1); glVertex2i( 0, 0); + glTexCoord2f(0, 0); glVertex2i( 0, WinHeight); + glTexCoord2f(1, 0); glVertex2i(WinWidth, WinHeight); + glTexCoord2f(1, 1); glVertex2i(WinWidth, 0); glEnd(); + glBindFramebuffer(GL_FRAMEBUFFER, e_FBO); e_SetViewPort(0, 0, e_FrameW, e_FrameH); end;