XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

Mesa: gen3: add R8 support

Browse Source 
git-svn-id: svn://kolibrios.org@4633 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2014-03-12 11:47:33 +00:00
parent d2cab8fdd5
commit 4ead82a5bb
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/sdk/sources/Mesa/src/mapi/Makefile
View File

@ -53,6 +53,6 @@ libGL.dll: $(LIBGL_OBJS) Makefile
$(CC) $(CFLAGS) -std=c99 $(MESA_DEFS) $(INC_MESA) -o $@ $< $(CC) $(CFLAGS) -std=c99 $(MESA_DEFS) $(INC_MESA) -o $@ $<
%.o : %.S Makefile %.o : %.S Makefile
$(CC) -c -save-temps -U_WIN32 -I $(MESA_SRC)/mesa -o $@ $< $(CC) -c -U_WIN32 -I $(MESA_SRC)/mesa -o $@ $<

4
contrib/sdk/sources/Mesa/src/mesa/Makefile
View File

@ -4,7 +4,7 @@ SRC_DIR:=$(SDK_DIR)/sources
MESA_SRC:= $(SRC_DIR)/Mesa/src MESA_SRC:= $(SRC_DIR)/Mesa/src
CFLAGS_OPT = -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -U_MSC_VER -Os CFLAGS_OPT = -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -U_MSC_VER -Os
CFLAGS_OPT+= -fomit-frame-pointer -mno-ms-bitfields -save-temps CFLAGS_OPT+= -fomit-frame-pointer -mno-ms-bitfields
CFLAGS = -c $(CFLAGS_OPT) CFLAGS = -c $(CFLAGS_OPT)
LD = ld LD = ld
@ -388,7 +388,7 @@ i965_dri.drv: $(I965_OBJS) $(MESA_OBJS) dri.def Makefile
$(CC) $(CFLAGS) -std=c99 $(MESA_DEFS) $(INC_MESA) $(INC_I965) -o $@ $< $(CC) $(CFLAGS) -std=c99 $(MESA_DEFS) $(INC_MESA) $(INC_I965) -o $@ $<
%.o : %.S Makefile %.o : %.S Makefile
$(CC) -c -save-temps -U_WIN32 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM -I $(MESA_SRC)/mesa -o $@ $< $(CC) -c -U_WIN32 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM -I $(MESA_SRC)/mesa -o $@ $<
%.o : %.cpp Makefile %.o : %.cpp Makefile
$(CC) $(CFLAGS) $(MESA_DEFS) $(INC_MESA) $(INC_I965) -o $@ $< $(CC) $(CFLAGS) $(MESA_DEFS) $(INC_MESA) $(INC_I965) -o $@ $<

1
contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c
View File

@ -47,6 +47,7 @@ translate_texture_format(gl_format mesa_format, GLenum DepthMode)
case MESA_FORMAT_I8: case MESA_FORMAT_I8:
return MAPSURF_8BIT | MT_8BIT_I8; return MAPSURF_8BIT | MT_8BIT_I8;
case MESA_FORMAT_A8: case MESA_FORMAT_A8:
case MESA_FORMAT_R8:
return MAPSURF_8BIT | MT_8BIT_A8; return MAPSURF_8BIT | MT_8BIT_A8;
case MESA_FORMAT_AL88: case MESA_FORMAT_AL88:
return MAPSURF_16BIT | MT_16BIT_AY88; return MAPSURF_16BIT | MT_16BIT_AY88;

4
contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_context.c
View File

@ -69,6 +69,7 @@ intelGetString(struct gl_context * ctx, GLenum name)
const struct intel_context *const intel = intel_context(ctx); const struct intel_context *const intel = intel_context(ctx);
const char *chipset; const char *chipset;
static char buffer[128]; static char buffer[128];
static char driver_name[] = "i915_dri.drv";
switch (name) { switch (name) {
case GL_VENDOR: case GL_VENDOR:
@ -88,6 +89,9 @@ intelGetString(struct gl_context * ctx, GLenum name)
(void) driGetRendererString(buffer, chipset, 0); (void) driGetRendererString(buffer, chipset, 0);
return (GLubyte *) buffer; return (GLubyte *) buffer;
case 0x1F04: /* GL_DRIVER_NAME */
return (GLubyte*)driver_name;
default: default:
return NULL; return NULL;
} }

2
contrib/sdk/sources/Mesa/src/mesa/drivers/dri/i915/intel_screen.c
View File

@ -1111,6 +1111,8 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
{ {
struct intel_screen *intelScreen; struct intel_screen *intelScreen;
printf("mesa-9.2.5-i915_dri build %s %s\n", __DATE__, __TIME__);
if (psp->dri2.loader->base.version <= 2 || if (psp->dri2.loader->base.version <= 2 ||
psp->dri2.loader->getBuffersWithFormat == NULL) { psp->dri2.loader->getBuffersWithFormat == NULL) {
fprintf(stderr, fprintf(stderr,