diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-21 22:50:26 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-21 22:56:24 +0100 |
| commit | eb71c0f23999d1cc156e1821d73634ec79621fc2 (patch) | |
| tree | d45d551ada10b1bfb3d57517c892770734a77817 /mesalib/src/mesa/main/fbobject.c | |
| parent | ab3d257d88f67e169a314ad0fac851fc2fc6cb05 (diff) | |
| parent | 41fea4472dec859ddec76bdfa7108ebec71de1e3 (diff) | |
| download | vcxsrv-eb71c0f23999d1cc156e1821d73634ec79621fc2.tar.gz vcxsrv-eb71c0f23999d1cc156e1821d73634ec79621fc2.tar.bz2 vcxsrv-eb71c0f23999d1cc156e1821d73634ec79621fc2.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver fontconfig libX11 libXext libxcb mesa git update 21 Mar 2014
Conflicts:
libxcb/src/xcb_auth.c
libxcb/src/xcb_conn.c
libxcb/src/xcb_util.c
libxcb/src/xcb_windefs.h
mesalib/src/mapi/glapi/glapi.h
Diffstat (limited to 'mesalib/src/mesa/main/fbobject.c')
| -rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index a9dcc5144..dfe2f1e93 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -1565,10 +1565,6 @@ _mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat) return ctx->API == API_OPENGL_COMPAT && ctx->Extensions.ARB_texture_float && ctx->Extensions.ARB_framebuffer_object ? GL_INTENSITY : 0; - case GL_RGB9_E5: - return (_mesa_is_desktop_gl(ctx) - && ctx->Extensions.EXT_texture_shared_exponent) - ? GL_RGB : 0; case GL_R11F_G11F_B10F: return ((_mesa_is_desktop_gl(ctx) && ctx->Extensions.EXT_packed_float) || _mesa_is_gles3(ctx) /* EXT_color_buffer_float */ ) |