X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fvframe3d.C;fp=cinelerra-5.1%2Fguicast%2Fvframe3d.C;h=ed47a40e0af55ef02810b2439a6c245373e1fecf;hp=42d91ba1af0b77d1a9243a3d1db105e02a84c6e8;hb=e620b69f6d3f1de30d8b2a16c46d7729462e5211;hpb=33aae273918725085d841a8af927bfccd2aa9364 diff --git a/cinelerra-5.1/guicast/vframe3d.C b/cinelerra-5.1/guicast/vframe3d.C index 42d91ba1..ed47a40e 100644 --- a/cinelerra-5.1/guicast/vframe3d.C +++ b/cinelerra-5.1/guicast/vframe3d.C @@ -147,7 +147,11 @@ void VFrame::to_texture() void VFrame::create_pbuffer() { +#ifdef GLx4 int ww = (get_w()+3) & ~3, hh = (get_h()+3) & ~3; +#else + int ww = get_w(), hh = get_h(); +#endif if( pbuffer && (pbuffer->w != ww || pbuffer->h != hh || pbuffer->window_id != BC_WindowBase::get_synchronous()->current_window->get_id() ) ) { delete pbuffer; @@ -293,6 +297,10 @@ void VFrame::init_screen(int w, int h) glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, zero); glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, zero); glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 0); +#ifndef GLx4 + glPixelStorei(GL_PACK_ALIGNMENT,1); + glPixelStorei(GL_UNPACK_ALIGNMENT,1); +#endif #endif }