fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 03:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge issue

Browse source
This commit is contained in:
Keith Whitwell 2007-08-10 10:20:35 +01:00
parent fa6815f056
commit 07fd9ad7bb
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mesa/drivers/dri/intel_winsys/intel_context.c
View file

@ -311,21 +311,6 @@ intelInitDriverFunctions(struct dd_function_table *functions)
/**
* Return list of surface formats supported by this driver.
*/
static const GLuint *
intel_supported_formats(struct pipe_context *pipe, GLuint *numFormats)
{
static const GLuint formats[] = {
PIPE_FORMAT_U_A8_R8_G8_B8,
PIPE_FORMAT_U_R5_G6_B5,
PIPE_FORMAT_S8_Z24,
};
*numFormats = sizeof(formats) / sizeof(formats[0]);
return formats;
}
GLboolean

20
src/mesa/drivers/dri/intel_winsys/intel_pipe_softpipe.c
View file

@ -36,9 +36,9 @@
#include "intel_context.h"
#include "intel_pipe.h"
#include "intel_surface.h"
#include "pipe/softpipe/sp_winsys.h"
#include "pipe/p_defines.h"
/* Shouldn't really need this:
*/
@ -158,6 +158,24 @@ intel_create_buffer(struct softpipe_winsys *sws,
}
/**
* Return list of surface formats supported by this driver.
*/
static const GLuint *
intel_supported_formats(struct pipe_context *pipe, GLuint *numFormats)
{
static const GLuint formats[] = {
PIPE_FORMAT_U_A8_R8_G8_B8,
PIPE_FORMAT_U_R5_G6_B5,
PIPE_FORMAT_S8_Z24,
};
*numFormats = sizeof(formats) / sizeof(formats[0]);
return formats;
}
struct pipe_context *
intel_create_softpipe( struct intel_context *intel )
{