From b7380ee5e915b2168c73a0135b82fcaf0800227b Mon Sep 17 00:00:00 2001 From: cxgeorge <> Date: Sat, 14 Sep 2002 01:12:38 +0000 Subject: [PATCH] remove accidentally checked in stuff --- panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx | 4 +--- panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx | 13 ------------- panda/src/wdxdisplay8/wdxGraphicsWindow8.h | 1 - 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx b/panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx index 71c7dc786b..a8c707d7e6 100644 --- a/panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx +++ b/panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx @@ -3238,6 +3238,7 @@ release_texture(TextureContext *tc) { } // copies current display region in framebuffer to the texture +// usually its more efficient to do SetRenderTgt void DXGraphicsStateGuardian:: copy_texture(TextureContext *tc, const DisplayRegion *dr) { @@ -3289,9 +3290,6 @@ copy_texture(TextureContext *tc, const DisplayRegion *dr) { //////////////////////////////////////////////////////////////////// void DXGraphicsStateGuardian:: copy_texture(TextureContext *tc, const DisplayRegion *dr, const RenderBuffer &rb) { - dxgsg_cat.fatal() << "DX copy_texture unimplemented!!!"; - return; - set_read_buffer(rb); copy_texture(tc, dr); } diff --git a/panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx b/panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx index 8ef7bace66..f85c88aa1d 100644 --- a/panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx +++ b/panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx @@ -2960,19 +2960,6 @@ get_depth_bitwidth(void) { // return ddsd.ddpfPixelFormat.dwRGBBitCount; } -void wdxGraphicsWindow:: -get_framebuffer_format(PixelBuffer::Type &fb_type, PixelBuffer::Format &fb_format) { - assert(_dxgsg!=NULL); - - fb_type = PixelBuffer::T_unsigned_byte; - // this is sortof incorrect, since for F_rgb5 it's really 5 bits per channel - //would have to change a lot of texture stuff to make this correct though - - if(IS_16BPP_DISPLAY_FORMAT(_dxgsg->scrn.PresParams.BackBufferFormat)) - fb_format = PixelBuffer::F_rgb5; - else fb_format = PixelBuffer::F_rgb; -} - // Global system parameters we want to modify during our run static int iMouseTrails; static bool bCursorShadowOn,bMouseVanish; diff --git a/panda/src/wdxdisplay8/wdxGraphicsWindow8.h b/panda/src/wdxdisplay8/wdxGraphicsWindow8.h index 9f7489f2b0..ad52331775 100644 --- a/panda/src/wdxdisplay8/wdxGraphicsWindow8.h +++ b/panda/src/wdxdisplay8/wdxGraphicsWindow8.h @@ -90,7 +90,6 @@ public: virtual bool resize(unsigned int xsize,unsigned int ysize); virtual unsigned int verify_window_sizes(unsigned int numsizes,unsigned int *dimen); virtual int get_depth_bitwidth(void); - virtual void get_framebuffer_format(PixelBuffer::Type &fb_type, PixelBuffer::Format &fb_format); protected: ButtonHandle lookup_key(WPARAM wparam) const;