From e63c78722b647f3d91c5a177c1b3efc00913cb27 Mon Sep 17 00:00:00 2001 From: NicJA Date: Sun, 15 Jan 2017 01:51:37 +0000 Subject: [PATCH] corrections/consistency git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@53215 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- rom/hidds/gfx/colorconv_init.c | 4 +- rom/hidds/gfx/gfx_hiddclass.c | 2 +- rom/hidds/gfx/gfx_init.c | 2 +- rom/hidds/gfx/gfx_intern.h | 6 +- rom/hidds/gfx/gfx_planarbitmapclass.c | 2 +- rom/hidds/gfx/include/gfx.h | 4 +- test/hidds/gfx/mmakefile.src | 6 +- .../devs/monitors/Compositor/include/compositor.h | 4 +- .../monitors/IntelGMA/compositing.h} | 16 +-- .../devs/monitors/IntelGMA/intelgma_bitmapclass.c | 24 ++-- .../devs/monitors/IntelGMA/intelgma_compositor.h | 4 +- .../monitors/IntelGMA/intelgma_compositorclass.c | 122 ++++++++++----------- workbench/devs/monitors/IntelGMA/intelgma_hidd.h | 10 +- .../devs/monitors/IntelGMA/intelgma_hiddclass.c | 10 +- workbench/devs/monitors/IntelGMA/intelgma_init.c | 6 +- .../devs/monitors/IntelGMA/intelgma_startup.c | 16 +-- workbench/hidds/nouveau/compositor.h | 4 +- workbench/libs/cgfx/scalepixelarray.c | 4 +- 18 files changed, 123 insertions(+), 123 deletions(-) copy workbench/{hidds/nouveau/compositor.h => devs/monitors/IntelGMA/compositing.h} (81%) diff --git a/rom/hidds/gfx/colorconv_init.c b/rom/hidds/gfx/colorconv_init.c index fd6b9ea248..9ba0b42199 100644 --- a/rom/hidds/gfx/colorconv_init.c +++ b/rom/hidds/gfx/colorconv_init.c @@ -1,8 +1,8 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Graphics hidd color conversion initialization code. + Desc: Gfx Hidd color conversion initialization code. Lang: English. */ #include diff --git a/rom/hidds/gfx/gfx_hiddclass.c b/rom/hidds/gfx/gfx_hiddclass.c index 566c47af49..ceda83815e 100644 --- a/rom/hidds/gfx/gfx_hiddclass.c +++ b/rom/hidds/gfx/gfx_hiddclass.c @@ -2,7 +2,7 @@ Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Graphics hidd class implementation. + Desc: Gfx Hidd driver class implementation. Lang: english */ diff --git a/rom/hidds/gfx/gfx_init.c b/rom/hidds/gfx/gfx_init.c index b0ba6bebfe..66560f6a5b 100644 --- a/rom/hidds/gfx/gfx_init.c +++ b/rom/hidds/gfx/gfx_init.c @@ -2,7 +2,7 @@ Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Graphics hidd initialization code. + Desc: Gfx Hidd initialization code. Lang: English. */ diff --git a/rom/hidds/gfx/gfx_intern.h b/rom/hidds/gfx/gfx_intern.h index 12320e6466..8f689009e2 100644 --- a/rom/hidds/gfx/gfx_intern.h +++ b/rom/hidds/gfx/gfx_intern.h @@ -3,8 +3,8 @@ $Id$ */ -#ifndef GRAPHICS_HIDD_INTERN_H -#define GRAPHICS_HIDD_INTERN_H +#ifndef GFX_HIDD_INTERN_H +#define GFX_HIDD_INTERN_H /* Include files */ @@ -382,4 +382,4 @@ static inline void DRAWPIXEL(OOP_Class *cl, OOP_Object *o, OOP_Object *gc, WORD #define DRAWPIXEL(cl, obj, gc, x, y) HIDD_BM_PutPixel(obj, gc, x, y) #endif -#endif /* GRAPHICS_HIDD_INTERN_H */ +#endif /* GFX_HIDD_INTERN_H */ diff --git a/rom/hidds/gfx/gfx_planarbitmapclass.c b/rom/hidds/gfx/gfx_planarbitmapclass.c index 2c6bab0ed8..d7a51ca6ee 100644 --- a/rom/hidds/gfx/gfx_planarbitmapclass.c +++ b/rom/hidds/gfx/gfx_planarbitmapclass.c @@ -38,7 +38,7 @@ When you create an object of this class, an associated planar bitmap will be created. However, it's possible to use this class with pre-existing bitmaps, making them - available to the graphics HIDD subsystem. + available to the Gfx Hidd subsystem. *****************************************************************************************/ diff --git a/rom/hidds/gfx/include/gfx.h b/rom/hidds/gfx/include/gfx.h index f42e412633..e9a2d30f00 100644 --- a/rom/hidds/gfx/include/gfx.h +++ b/rom/hidds/gfx/include/gfx.h @@ -2,10 +2,10 @@ #define HIDD_GRAPHICS_H /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Definitions for the Graphics HIDD system. + Desc: Definitions for the Gfx Hidd system. Lang: english */ diff --git a/test/hidds/gfx/mmakefile.src b/test/hidds/gfx/mmakefile.src index c7587ab46c..f15c558f3a 100644 --- a/test/hidds/gfx/mmakefile.src +++ b/test/hidds/gfx/mmakefile.src @@ -9,10 +9,10 @@ FILES := \ hiddmodeid \ modeid -#MM- test : test-hidd-graphics -#MM test-hidd-graphics : includes linklibs +#MM- test : test-hidd-gfx +#MM test-hidd-gfx : includes linklibs -%build_progs mmake=test-hidd-graphics \ +%build_progs mmake=test-hidd-gfx \ files=$(FILES) targetdir=$(EXEDIR) \ uselibs="hiddstubs" diff --git a/workbench/devs/monitors/Compositor/include/compositor.h b/workbench/devs/monitors/Compositor/include/compositor.h index fdff1cb724..3e3e17a2ce 100644 --- a/workbench/devs/monitors/Compositor/include/compositor.h +++ b/workbench/devs/monitors/Compositor/include/compositor.h @@ -32,8 +32,8 @@ * Changing this breaks binary compatibility. graphics.library recognizes * this class by its name. */ -#define CLID_Hidd_Compositor "hidd.graphics.compositor" -#define IID_Hidd_Compositor "hidd.graphics.compositor" +#define CLID_Hidd_Compositor "hidd.gfx.compositor" +#define IID_Hidd_Compositor "hidd.gfx.compositor" /* Compositor class methods */ diff --git a/workbench/hidds/nouveau/compositor.h b/workbench/devs/monitors/IntelGMA/compositing.h similarity index 81% copy from workbench/hidds/nouveau/compositor.h copy to workbench/devs/monitors/IntelGMA/compositing.h index aa8e0c1002..01450072ee 100644 --- a/workbench/hidds/nouveau/compositor.h +++ b/workbench/devs/monitors/IntelGMA/compositing.h @@ -1,7 +1,7 @@ -#ifndef HIDD_COMPOSITOR_H -#define HIDD_COMPOSITOR_H +#ifndef HIDD_COMPOSITING_H +#define HIDD_COMPOSITING_H /* - Copyright © 2010-2017, The AROS Development Team. All rights reserved. + Copyright © 2010, The AROS Development Team. All rights reserved. $Id$ */ @@ -22,8 +22,8 @@ #endif /* Compositor interface */ -#define CLID_Hidd_Compositor "hidd.graphics.compositor" -#define IID_Hidd_Compositor "hidd.graphics.compositor" +#define CLID_Hidd_Compositor "hidd.gfx.compositor" +#define IID_Hidd_Compositor "hidd.gfx.compositor" #define HiddCompositorAttrBase __IHidd_Compositor @@ -40,7 +40,7 @@ enum moHidd_Compositor_BitMapPositionChanged, moHidd_Compositor_ValidateBitMapPositionChange, - NUM_COMPOSITOR_METHODS + NUM_COMPOSITING_METHODS }; enum @@ -52,7 +52,7 @@ enum #define aHidd_Compositor_GfxHidd (HiddCompositorAttrBase + aoHidd_Compositor_GfxHidd) -#define IS_COMPOSITOR_ATTR(attr, idx) \ +#define IS_COMPOSITING_ATTR(attr, idx) \ (((idx) = (attr) - HiddCompositorAttrBase) < num_Hidd_Compositor_Attrs) struct pHidd_Compositor_BitMapStackChanged @@ -85,4 +85,4 @@ struct pHidd_Compositor_ValidateBitMapPositionChange LONG *newyoffset; }; -#endif /* HIDD_COMPOSITOR_H */ +#endif /* HIDD_COMPOSITING_H */ diff --git a/workbench/devs/monitors/IntelGMA/intelgma_bitmapclass.c b/workbench/devs/monitors/IntelGMA/intelgma_bitmapclass.c index db64b09432..f6228fd598 100644 --- a/workbench/devs/monitors/IntelGMA/intelgma_bitmapclass.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_bitmapclass.c @@ -115,10 +115,10 @@ OOP_Object *METHOD(GMABM, Root, New) bm->fbid = 0; /* Default value */ if (displayable) bm->displayable = TRUE; else bm->displayable = FALSE; - //bm->compositing = sd->compositing; - bm->compositing = (OOP_Object *) - GetTagData(aHidd_BitMap_IntelG45_CompositingHidd, 0, msg->attrList); - /* FIXME: check if compositing hidd was passed */ + //bm->compositor = sd->compositor; + bm->compositor = (OOP_Object *) + GetTagData(aHidd_BitMap_IntelG45_CompositorHidd, 0, msg->attrList); + /* FIXME: check if compositor hidd was passed */ if (displayable) { @@ -317,7 +317,7 @@ VOID METHOD(GMABM, Root, Set) } /* If there was a change requested, validate it */ - struct pHidd_Compositing_ValidateBitMapPositionChange vbpcmsg = + struct pHidd_Compositor_ValidateBitMapPositionChange vbpcmsg = { mID : SD(cl)->mid_ValidateBitMapPositionChange, bm : o, @@ -325,12 +325,12 @@ VOID METHOD(GMABM, Root, Set) newyoffset : &newyoffset }; - OOP_DoMethod(bmdata->compositing, (OOP_Msg)&vbpcmsg); + OOP_DoMethod(bmdata->compositor, (OOP_Msg)&vbpcmsg); if ((newxoffset != bmdata->xoffset) || (newyoffset != bmdata->yoffset)) { /* If change passed validation, execute it */ - struct pHidd_Compositing_BitMapPositionChanged bpcmsg = + struct pHidd_Compositor_BitMapPositionChanged bpcmsg = { mID : SD(cl)->mid_BitMapPositionChanged, bm : o @@ -339,7 +339,7 @@ VOID METHOD(GMABM, Root, Set) bmdata->xoffset = newxoffset; bmdata->yoffset = newyoffset; - OOP_DoMethod(bmdata->compositing, (OOP_Msg)&bpcmsg); + OOP_DoMethod(bmdata->compositor, (OOP_Msg)&bpcmsg); } OOP_DoSuperMethod(cl, o, (OOP_Msg)msg); @@ -977,7 +977,7 @@ VOID METHOD(GMABM, Hidd_BitMap, ReleaseDirectAccess) if (bm->displayable) { - struct pHidd_Compositing_BitMapRectChanged brcmsg = + struct pHidd_Compositor_BitMapRectChanged brcmsg = { mID : SD(cl)->mid_BitMapRectChanged, bm : o, @@ -986,7 +986,7 @@ VOID METHOD(GMABM, Hidd_BitMap, ReleaseDirectAccess) width : bm->width, height : bm->height }; - OOP_DoMethod(bm->compositing, (OOP_Msg)&brcmsg); + OOP_DoMethod(bm->compositor, (OOP_Msg)&brcmsg); } } @@ -2168,7 +2168,7 @@ VOID METHOD(GMABM, Hidd_BitMap, UpdateRect) D(bug("[GMA]BitMap::UpdateRect %d,%d-%d,%d o=%p\n",msg->x,msg->y,msg->width,msg->height,o)); if (bmdata->displayable) { - struct pHidd_Compositing_BitMapRectChanged brcmsg = + struct pHidd_Compositor_BitMapRectChanged brcmsg = { mID : SD(cl)->mid_BitMapRectChanged, bm : o, @@ -2177,7 +2177,7 @@ VOID METHOD(GMABM, Hidd_BitMap, UpdateRect) width : msg->width, height : msg->height }; - OOP_DoMethod(bmdata->compositing, (OOP_Msg)&brcmsg); + OOP_DoMethod(bmdata->compositor, (OOP_Msg)&brcmsg); } } diff --git a/workbench/devs/monitors/IntelGMA/intelgma_compositor.h b/workbench/devs/monitors/IntelGMA/intelgma_compositor.h index 97e1444ef6..bcf0be67b7 100644 --- a/workbench/devs/monitors/IntelGMA/intelgma_compositor.h +++ b/workbench/devs/monitors/IntelGMA/intelgma_compositor.h @@ -27,7 +27,7 @@ struct StackBitMapNode LONG displayedheight; }; -struct HIDDCompositingData +struct HIDDCompositorData { OOP_Object *screenbitmap; OOP_Object *directbitmap; @@ -42,7 +42,7 @@ struct HIDDCompositingData OOP_Object *gc; /* GC object used for drawing operations */ }; -extern const struct OOP_InterfaceDescr Compositing_ifdescr[]; +extern const struct OOP_InterfaceDescr Compositor_ifdescr[]; #define METHOD(base, id, name) \ base ## __ ## id ## __ ## name (OOP_Class *cl, OOP_Object *o, struct p ## id ## _ ## name *msg) diff --git a/workbench/devs/monitors/IntelGMA/intelgma_compositorclass.c b/workbench/devs/monitors/IntelGMA/intelgma_compositorclass.c index a4b28af6d5..6545e4d6b9 100644 --- a/workbench/devs/monitors/IntelGMA/intelgma_compositorclass.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_compositorclass.c @@ -44,7 +44,7 @@ static BOOL AndRectRect(struct _Rectangle * rect1, struct _Rectangle * rect2, return TRUE; } -static struct StackBitMapNode * HIDDCompositingIsBitMapOnStack(struct HIDDCompositingData * compdata, OOP_Object * bm) +static struct StackBitMapNode * HIDDCompositorIsBitMapOnStack(struct HIDDCompositorData * compdata, OOP_Object * bm) { struct StackBitMapNode * n = NULL; @@ -57,7 +57,7 @@ static struct StackBitMapNode * HIDDCompositingIsBitMapOnStack(struct HIDDCompos return NULL; } -static struct StackBitMapNode * HIDDCompositingCanUseFramebuffer(struct HIDDCompositingData * compdata) +static struct StackBitMapNode * HIDDCompositorCanUseFramebuffer(struct HIDDCompositorData * compdata) { struct StackBitMapNode * n = NULL; struct StackBitMapNode * frn = NULL; @@ -76,11 +76,11 @@ static struct StackBitMapNode * HIDDCompositingCanUseFramebuffer(struct HIDDComp else return NULL; } } - D(bug("[Compositing] HIDDCompositingCanUseFramebuffer bm %x\n",frn->bm)); + D(bug("[Compositor] HIDDCompositorCanUseFramebuffer bm %x\n",frn->bm)); return frn; } -static VOID HIDDCompositingRecalculateVisibleRects(struct HIDDCompositingData * compdata) +static VOID HIDDCompositorRecalculateVisibleRects(struct HIDDCompositorData * compdata) { ULONG lastscreenvisibleline = compdata->screenrect.MaxY + 1; struct StackBitMapNode * n = NULL; @@ -107,7 +107,7 @@ static VOID HIDDCompositingRecalculateVisibleRects(struct HIDDCompositingData * else n->isscreenvisible = FALSE; - D(bug("[Compositing] Bitmap %x, visible %d, (%d, %d) , (%d, %d)\n", + D(bug("[Compositor] Bitmap %x, visible %d, (%d, %d) , (%d, %d)\n", n->bm, n->isscreenvisible, n->screenvisiblerect.MinX, n->screenvisiblerect.MinY, n->screenvisiblerect.MaxX, n->screenvisiblerect.MaxY)); @@ -116,7 +116,7 @@ static VOID HIDDCompositingRecalculateVisibleRects(struct HIDDCompositingData * } -static VOID HIDDCompositingRecalculateDisplayedWidthHeight(struct HIDDCompositingData * compdata) +static VOID HIDDCompositorRecalculateDisplayedWidthHeight(struct HIDDCompositorData * compdata) { struct StackBitMapNode * n = NULL; IPTR displayedwidth, displayedheight; @@ -131,7 +131,7 @@ static VOID HIDDCompositingRecalculateDisplayedWidthHeight(struct HIDDCompositin } } -static BOOL HIDDCompositingTopBitMapChanged(struct HIDDCompositingData * compdata, OOP_Object * bm) +static BOOL HIDDCompositorTopBitMapChanged(struct HIDDCompositorData * compdata, OOP_Object * bm) { /* Desctiption: @@ -151,8 +151,8 @@ static BOOL HIDDCompositingTopBitMapChanged(struct HIDDCompositingData * compdat /* Sanity check */ if (compdata->gfx != (OOP_Object *)e) { - /* Provided top bitmap is not using the same driver as compositing. Fail. */ - D(bug("[Compositing] GfxHidd different than one used by compositing\n")); + /* Provided top bitmap is not using the same driver as compositor. Fail. */ + D(bug("[Compositor] GfxHidd different than one used by compositor\n")); return FALSE; } @@ -160,7 +160,7 @@ static BOOL HIDDCompositingTopBitMapChanged(struct HIDDCompositingData * compdat OOP_GetAttr(bm, aHidd_BitMap_ModeID, &modeid); if (modeid == vHidd_ModeID_Invalid) { - D(bug("[Compositing] Invalid ModeID\n")); + D(bug("[Compositor] Invalid ModeID\n")); return FALSE; } @@ -234,7 +234,7 @@ static BOOL HIDDCompositingTopBitMapChanged(struct HIDDCompositingData * compdat return FALSE; } -static BOOL HIDDCompositingCanCompositeWithScreenBitMap(struct HIDDCompositingData * compdata, OOP_Object * bm) +static BOOL HIDDCompositorCanCompositeWithScreenBitMap(struct HIDDCompositorData * compdata, OOP_Object * bm) { OOP_Object * screenbm = compdata->screenbitmap; IPTR screenbmwidth, screenbmheight, screenbmstdpixfmt; @@ -270,13 +270,13 @@ static BOOL HIDDCompositingCanCompositeWithScreenBitMap(struct HIDDCompositingDa return TRUE; } -static VOID HIDDCompositingRedrawBitmap(struct HIDDCompositingData * compdata, +static VOID HIDDCompositorRedrawBitmap(struct HIDDCompositorData * compdata, OOP_Object * bm, WORD x, WORD y, WORD width, WORD height, BOOL clean) { struct StackBitMapNode * n = NULL; /* Check if passed bitmap is in stack, ignore if not */ - if ((n = HIDDCompositingIsBitMapOnStack(compdata, bm)) == NULL) + if ((n = HIDDCompositorIsBitMapOnStack(compdata, bm)) == NULL) return; if (!n->isscreenvisible) @@ -323,7 +323,7 @@ static VOID HIDDCompositingRedrawBitmap(struct HIDDCompositingData * compdata, if( clean && dstandvisrect.MaxX+1 < n->screenvisiblerect.MaxX ) { /* Clean right side.*/ - D(bug("[Compositing] clean right %d,%d-%d,%d\n",dstandvisrect.MaxX+1, dstandvisrect.MinY, + D(bug("[Compositor] clean right %d,%d-%d,%d\n",dstandvisrect.MaxX+1, dstandvisrect.MinY, n->screenvisiblerect.MaxX, dstandvisrect.MaxY)); HIDD_BM_FillRect(compdata->screenbitmap, compdata->gc, dstandvisrect.MaxX+1, dstandvisrect.MinY-1, @@ -333,7 +333,7 @@ static VOID HIDDCompositingRedrawBitmap(struct HIDDCompositingData * compdata, if( clean && dstandvisrect.MaxY+1 < n->screenvisiblerect.MaxY ) { /* Clean bottom.*/ - D(bug("[Compositing] clean bottom %d,%d-%d,%d\n", + D(bug("[Compositor] clean bottom %d,%d-%d,%d\n", dstandvisrect.MinX, dstandvisrect.MaxY+1, n->screenvisiblerect.MaxX, n->screenvisiblerect.MaxY)); HIDD_BM_FillRect(compdata->screenbitmap, compdata->gc, @@ -345,20 +345,20 @@ static VOID HIDDCompositingRedrawBitmap(struct HIDDCompositingData * compdata, } } -static VOID HIDDCompositingRedrawVisibleScreen(struct HIDDCompositingData * compdata) +static VOID HIDDCompositorRedrawVisibleScreen(struct HIDDCompositorData * compdata) { struct StackBitMapNode * n = NULL; ULONG lastscreenvisibleline = compdata->screenrect.MaxY; /* Recalculate visible rects per screen */ - HIDDCompositingRecalculateVisibleRects(compdata); + HIDDCompositorRecalculateVisibleRects(compdata); /* use direct framebuffer if it is possible */ struct StackBitMapNode *fbn; - if( ( fbn = HIDDCompositingCanUseFramebuffer(compdata) ) ) + if( ( fbn = HIDDCompositorCanUseFramebuffer(compdata) ) ) { if( HIDD_INTELG45_SetFramebuffer( fbn->bm ) ){ - D(bug("[Compositing] directbitmap used, bitmap %x\n",fbn->bm);); + D(bug("[Compositor] directbitmap used, bitmap %x\n",fbn->bm);); compdata->directbitmap = fbn->bm; } } @@ -366,7 +366,7 @@ static VOID HIDDCompositingRedrawVisibleScreen(struct HIDDCompositingData * comp { if( compdata->directbitmap ){ compdata->directbitmap = NULL; - D(bug("[Compositing] directbitmap not used, set screenbitmap %x\n",compdata->screenbitmap);); + D(bug("[Compositor] directbitmap not used, set screenbitmap %x\n",compdata->screenbitmap);); HIDD_INTELG45_SetFramebuffer( compdata->screenbitmap ); } } @@ -381,7 +381,7 @@ static VOID HIDDCompositingRedrawVisibleScreen(struct HIDDCompositingData * comp OOP_GetAttr(n->bm, aHidd_BitMap_Width, &width); OOP_GetAttr(n->bm, aHidd_BitMap_Height, &height); - HIDDCompositingRedrawBitmap(compdata, n->bm, 0, 0, width, height, TRUE); + HIDDCompositorRedrawBitmap(compdata, n->bm, 0, 0, width, height, TRUE); if (lastscreenvisibleline > n->screenvisiblerect.MinY) lastscreenvisibleline = n->screenvisiblerect.MinY; } @@ -395,13 +395,13 @@ static VOID HIDDCompositingRedrawVisibleScreen(struct HIDDCompositingData * comp IPTR viswidth; OOP_GetAttr(compdata->screenbitmap, aHidd_BitMap_Width, &viswidth); - D(bug("[Compositing] Clean upper area %d,%d-%d,%d\n",0, 0, viswidth - 1, lastscreenvisibleline - 1)); + D(bug("[Compositor] Clean upper area %d,%d-%d,%d\n",0, 0, viswidth - 1, lastscreenvisibleline - 1)); HIDD_BM_FillRect(compdata->screenbitmap, compdata->gc, 0, 0, viswidth - 1, lastscreenvisibleline - 1); } } -static VOID HIDDCompositingPurgeBitMapStack(struct HIDDCompositingData * compdata) +static VOID HIDDCompositorPurgeBitMapStack(struct HIDDCompositorData * compdata) { struct StackBitMapNode * curr, * next; @@ -418,13 +418,13 @@ static VOID HIDDCompositingPurgeBitMapStack(struct HIDDCompositingData * compdat /* PUBLIC METHODS */ -OOP_Object *METHOD(Compositing, Root, New) +OOP_Object *METHOD(Compositor, Root, New) { o = (OOP_Object *)OOP_DoSuperMethod(cl, o, (OOP_Msg) msg); - D(bug("[Compositing] New\n")); + D(bug("[Compositor] New\n")); if(o) { - struct HIDDCompositingData * compdata = OOP_INST_DATA(cl, o); + struct HIDDCompositorData * compdata = OOP_INST_DATA(cl, o); NEWLIST(&compdata->bitmapstack); compdata->screenbitmap = NULL; @@ -432,7 +432,7 @@ OOP_Object *METHOD(Compositing, Root, New) compdata->screenmodeid = vHidd_ModeID_Invalid; InitSemaphore(&compdata->semaphore); - compdata->gfx = (OOP_Object *)GetTagData(aHidd_Compositing_GfxHidd, 0, msg->attrList); + compdata->gfx = (OOP_Object *)GetTagData(aHidd_Compositor_GfxHidd, 0, msg->attrList); if (compdata->gfx != NULL) { @@ -453,17 +453,17 @@ OOP_Object *METHOD(Compositing, Root, New) return o; } -VOID METHOD(Compositing, Hidd_Compositing, BitMapStackChanged) +VOID METHOD(Compositor, Hidd_Compositor, BitMapStackChanged) { struct HIDD_ViewPortData * vpdata; - struct HIDDCompositingData * compdata = OOP_INST_DATA(cl, o); + struct HIDDCompositorData * compdata = OOP_INST_DATA(cl, o); - D(bug("[Compositing] BitMapStackChanged\n")); + D(bug("[Compositor] BitMapStackChanged\n")); LOCK_COMPOSITING_WRITE /* Free all items which are already on the list */ - HIDDCompositingPurgeBitMapStack(compdata); + HIDDCompositorPurgeBitMapStack(compdata); if (!msg->data) @@ -473,10 +473,10 @@ VOID METHOD(Compositing, Hidd_Compositing, BitMapStackChanged) } /* Switch mode if needed */ - if (!HIDDCompositingTopBitMapChanged(compdata, msg->data->Bitmap)) + if (!HIDDCompositorTopBitMapChanged(compdata, msg->data->Bitmap)) { /* Something bad happened. Yes, bitmap stack is already erased - that's ok */ - D(bug("[Compositing] Failed to change top bitmap\n")); + D(bug("[Compositor] Failed to change top bitmap\n")); UNLOCK_COMPOSITING return; } @@ -486,7 +486,7 @@ VOID METHOD(Compositing, Hidd_Compositing, BitMapStackChanged) { /* Check if the passed bitmap can be composited together with screen bitmap */ - if (HIDDCompositingCanCompositeWithScreenBitMap(compdata, vpdata->Bitmap)) + if (HIDDCompositorCanCompositeWithScreenBitMap(compdata, vpdata->Bitmap)) { struct StackBitMapNode * n = AllocMem(sizeof(struct StackBitMapNode), MEMF_ANY | MEMF_CLEAR); n->bm = vpdata->Bitmap; @@ -498,52 +498,52 @@ VOID METHOD(Compositing, Hidd_Compositing, BitMapStackChanged) } /* Set displayedwidth/displayedheight on all screen bitmaps */ - HIDDCompositingRecalculateDisplayedWidthHeight(compdata); + HIDDCompositorRecalculateDisplayedWidthHeight(compdata); /* Redraw bitmap stack */ - HIDDCompositingRedrawVisibleScreen(compdata); + HIDDCompositorRedrawVisibleScreen(compdata); UNLOCK_COMPOSITING } -VOID METHOD(Compositing, Hidd_Compositing, BitMapRectChanged) +VOID METHOD(Compositor, Hidd_Compositor, BitMapRectChanged) { - struct HIDDCompositingData * compdata = OOP_INST_DATA(cl, o); - //D(bug("[Compositing] BitMapRectChanged\n")); + struct HIDDCompositorData * compdata = OOP_INST_DATA(cl, o); + //D(bug("[Compositor] BitMapRectChanged\n")); if( ! compdata->directbitmap ){ LOCK_COMPOSITING_READ - HIDDCompositingRedrawBitmap(compdata, msg->bm, msg->x, msg->y, msg->width, msg->height, FALSE); + HIDDCompositorRedrawBitmap(compdata, msg->bm, msg->x, msg->y, msg->width, msg->height, FALSE); UNLOCK_COMPOSITING } } -VOID METHOD(Compositing, Hidd_Compositing, BitMapPositionChanged) +VOID METHOD(Compositor, Hidd_Compositor, BitMapPositionChanged) { - struct HIDDCompositingData * compdata = OOP_INST_DATA(cl, o); - D(bug("[Compositing] BitMapPositionChanged\n")); + struct HIDDCompositorData * compdata = OOP_INST_DATA(cl, o); + D(bug("[Compositor] BitMapPositionChanged\n")); LOCK_COMPOSITING_READ /* Check is passed bitmap is in stack, ignore if not */ - if (HIDDCompositingIsBitMapOnStack(compdata, msg->bm) != NULL) + if (HIDDCompositorIsBitMapOnStack(compdata, msg->bm) != NULL) { /* Redraw bitmap stack */ - HIDDCompositingRedrawVisibleScreen(compdata); + HIDDCompositorRedrawVisibleScreen(compdata); } UNLOCK_COMPOSITING } -VOID METHOD(Compositing, Hidd_Compositing, ValidateBitMapPositionChange) +VOID METHOD(Compositor, Hidd_Compositor, ValidateBitMapPositionChange) { - struct HIDDCompositingData * compdata = OOP_INST_DATA(cl, o); + struct HIDDCompositorData * compdata = OOP_INST_DATA(cl, o); struct StackBitMapNode * n = NULL; - D(bug("[Compositing] ValidateBitMapPositionChange %d,%d\n", + D(bug("[Compositor] ValidateBitMapPositionChange %d,%d\n", *msg->newxoffset,*msg->newyoffset)); LOCK_COMPOSITING_READ /* Check if passed bitmap is in stack, ignore if not */ - if ((n = HIDDCompositingIsBitMapOnStack(compdata, msg->bm)) != NULL) + if ((n = HIDDCompositorIsBitMapOnStack(compdata, msg->bm)) != NULL) { IPTR width, height; LONG limit; @@ -572,27 +572,27 @@ VOID METHOD(Compositing, Hidd_Compositing, ValidateBitMapPositionChange) } -static const struct OOP_MethodDescr Compositing_Root_descr[] = +static const struct OOP_MethodDescr Compositor_Root_descr[] = { - {(OOP_MethodFunc)Compositing__Root__New, moRoot_New}, + {(OOP_MethodFunc)Compositor__Root__New, moRoot_New}, {NULL, 0} }; -#define NUM_Compositing_Root_METHODS 1 +#define NUM_Compositor_Root_METHODS 1 -static const struct OOP_MethodDescr Compositing_Hidd_Compositing_descr[] = +static const struct OOP_MethodDescr Compositor_Hidd_Compositor_descr[] = { - {(OOP_MethodFunc)Compositing__Hidd_Compositing__BitMapStackChanged, moHidd_Compositing_BitMapStackChanged}, - {(OOP_MethodFunc)Compositing__Hidd_Compositing__BitMapRectChanged, moHidd_Compositing_BitMapRectChanged}, - {(OOP_MethodFunc)Compositing__Hidd_Compositing__BitMapPositionChanged, moHidd_Compositing_BitMapPositionChanged}, - {(OOP_MethodFunc)Compositing__Hidd_Compositing__ValidateBitMapPositionChange, moHidd_Compositing_ValidateBitMapPositionChange}, + {(OOP_MethodFunc)Compositor__Hidd_Compositor__BitMapStackChanged, moHidd_Compositor_BitMapStackChanged}, + {(OOP_MethodFunc)Compositor__Hidd_Compositor__BitMapRectChanged, moHidd_Compositor_BitMapRectChanged}, + {(OOP_MethodFunc)Compositor__Hidd_Compositor__BitMapPositionChanged, moHidd_Compositor_BitMapPositionChanged}, + {(OOP_MethodFunc)Compositor__Hidd_Compositor__ValidateBitMapPositionChange, moHidd_Compositor_ValidateBitMapPositionChange}, {NULL, 0} }; -#define NUM_Compositing_Hidd_Compositing_METHODS 4 +#define NUM_Compositor_Hidd_Compositor_METHODS 4 -const struct OOP_InterfaceDescr Compositing_ifdescr[] = +const struct OOP_InterfaceDescr Compositor_ifdescr[] = { - {Compositing_Root_descr, IID_Root, NUM_Compositing_Root_METHODS}, - {Compositing_Hidd_Compositing_descr, IID_Hidd_Compositing, NUM_Compositing_Hidd_Compositing_METHODS}, + {Compositor_Root_descr, IID_Root, NUM_Compositor_Root_METHODS}, + {Compositor_Hidd_Compositor_descr, IID_Hidd_Compositor, NUM_Compositor_Hidd_Compositor_METHODS}, {NULL, NULL} }; diff --git a/workbench/devs/monitors/IntelGMA/intelgma_hidd.h b/workbench/devs/monitors/IntelGMA/intelgma_hidd.h index 1875a3d719..28d3d44dd0 100644 --- a/workbench/devs/monitors/IntelGMA/intelgma_hidd.h +++ b/workbench/devs/monitors/IntelGMA/intelgma_hidd.h @@ -85,7 +85,7 @@ typedef struct { BOOL displayable; /* Can bitmap be displayed on screen */ /* Information connected with display */ - OOP_Object *compositing; /* Compositing object used by bitmap */ + OOP_Object *compositor; /* Compositor object used by bitmap */ LONG xoffset; /* Offset to bitmap point that is displayed as (0,0) on screen */ LONG yoffset; /* Offset to bitmap point that is displayed as (0,0) on screen */ ULONG fbid; /* Contains ID under which bitmap @@ -162,10 +162,10 @@ struct g45staticdata OOP_Class * IntelG45Class; OOP_Class * IntelI2C; OOP_Class * BMClass; - OOP_Class * compositingclass; + OOP_Class * compositorclass; OOP_Class * galliumclass; - OOP_Object *compositing; + OOP_Object *compositor; OOP_Object * PCIObject; OOP_Object * PCIDevice; @@ -212,12 +212,12 @@ struct g45staticdata enum { aoHidd_GMABitMap_Drawable, - aoHidd_BitMap_IntelG45_CompositingHidd, + aoHidd_BitMap_IntelG45_CompositorHidd, num_Hidd_GMABitMap_Attrs }; #define aHidd_GMABitMap_Drawable (HiddGMABitMapAttrBase + aoHidd_GMABitMap_Drawable) -#define aHidd_BitMap_IntelG45_CompositingHidd (HiddGMABitMapAttrBase + aoHidd_BitMap_IntelG45_CompositingHidd) +#define aHidd_BitMap_IntelG45_CompositorHidd (HiddGMABitMapAttrBase + aoHidd_BitMap_IntelG45_CompositorHidd) #define IS_BM_ATTR(attr, idx) (((idx)=(attr)-HiddBitMapAttrBase) < num_Hidd_BitMap_Attrs) #define IS_GMABM_ATTR(attr, idx) (((idx)=(attr)-HiddGMABitMapAttrBase) < num_Hidd_GMABitMap_Attrs) diff --git a/workbench/devs/monitors/IntelGMA/intelgma_hiddclass.c b/workbench/devs/monitors/IntelGMA/intelgma_hiddclass.c index 0b1cb20164..46845cdc7d 100644 --- a/workbench/devs/monitors/IntelGMA/intelgma_hiddclass.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_hiddclass.c @@ -571,7 +571,7 @@ OOP_Object *METHOD(INTELG45, Root, New) { struct TagItem comptags [] = { - { aHidd_Compositing_GfxHidd, (IPTR)o }, + { aHidd_Compositor_GfxHidd, (IPTR)o }, { TAG_DONE, TAG_DONE } }; sd->compositing = OOP_NewObject(sd->compositingclass, NULL, comptags); @@ -684,7 +684,7 @@ OOP_Object * METHOD(INTELG45, Hidd_Gfx, CreateObject) { { TAG_IGNORE, TAG_IGNORE }, /* Placeholder for aHidd_BitMap_ClassPtr */ { TAG_IGNORE, TAG_IGNORE }, /* Placeholder for aHidd_BitMap_Align */ - { aHidd_BitMap_IntelG45_CompositingHidd, (IPTR)sd->compositing }, + { aHidd_BitMap_IntelG45_CompositorHidd, (IPTR)sd->compositing }, { TAG_MORE, (IPTR)msg->attrList } }; @@ -900,13 +900,13 @@ void METHOD(INTELG45, Hidd_Gfx, CopyBox) ULONG METHOD(INTELG45, Hidd_Gfx, ShowViewPorts) { - struct pHidd_Compositing_BitMapStackChanged bscmsg = + struct pHidd_Compositor_BitMapStackChanged bscmsg = { - mID : OOP_GetMethodID(IID_Hidd_Compositing, moHidd_Compositing_BitMapStackChanged), + mID : OOP_GetMethodID(IID_Hidd_Compositor, moHidd_Compositor_BitMapStackChanged), data : msg->Data }; D(bug("[IntelG45] ShowViewPorts enter TopLevelBM %x\n", msg->Data->Bitmap)); - OOP_DoMethod(sd->compositing, (OOP_Msg)&bscmsg); + OOP_DoMethod(sd->compositor, (OOP_Msg)&bscmsg); return TRUE; /* Indicate driver supports this method */ } diff --git a/workbench/devs/monitors/IntelGMA/intelgma_init.c b/workbench/devs/monitors/IntelGMA/intelgma_init.c index 0fa79586b3..d23081b743 100644 --- a/workbench/devs/monitors/IntelGMA/intelgma_init.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_init.c @@ -515,9 +515,9 @@ int G45_Init(struct g45staticdata *sd) sd->mid_CopyLUTMemBox32 = OOP_GetMethodID((STRPTR)CLID_Hidd_BitMap, moHidd_BitMap_CopyLUTMemBox32); sd->mid_GetImage = OOP_GetMethodID((STRPTR)CLID_Hidd_BitMap, moHidd_BitMap_GetImage); - sd->mid_BitMapPositionChanged = OOP_GetMethodID((STRPTR)IID_Hidd_Compositing, moHidd_Compositing_BitMapPositionChanged); - sd->mid_BitMapRectChanged = OOP_GetMethodID((STRPTR)IID_Hidd_Compositing, moHidd_Compositing_BitMapRectChanged); - sd->mid_ValidateBitMapPositionChange = OOP_GetMethodID((STRPTR)IID_Hidd_Compositing, moHidd_Compositing_ValidateBitMapPositionChange); + sd->mid_BitMapPositionChanged = OOP_GetMethodID((STRPTR)IID_Hidd_Compositor, moHidd_Compositor_BitMapPositionChanged); + sd->mid_BitMapRectChanged = OOP_GetMethodID((STRPTR)IID_Hidd_Compositor, moHidd_Compositor_BitMapRectChanged); + sd->mid_ValidateBitMapPositionChange = OOP_GetMethodID((STRPTR)IID_Hidd_Compositor, moHidd_Compositor_ValidateBitMapPositionChange); return TRUE; } diff --git a/workbench/devs/monitors/IntelGMA/intelgma_startup.c b/workbench/devs/monitors/IntelGMA/intelgma_startup.c index b875cf8e78..656a59b4f4 100644 --- a/workbench/devs/monitors/IntelGMA/intelgma_startup.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_startup.c @@ -32,7 +32,7 @@ OOP_AttrBase HiddGMABitMapAttrBase; OOP_AttrBase HiddI2CAttrBase; OOP_AttrBase HiddI2CDeviceAttrBase; OOP_AttrBase HiddGCAttrBase; -OOP_AttrBase HiddCompositingAttrBase; +OOP_AttrBase HiddCompositorAttrBase; OOP_AttrBase MetaAttrBase; OOP_AttrBase HiddAttrBase; OOP_AttrBase HiddPCIDeviceAttrBase; @@ -65,7 +65,7 @@ static const struct OOP_ABDescr attrbases[] = {IID_Hidd_I2CDevice , &HiddI2CDeviceAttrBase }, {IID_Hidd_PlanarBM , &__IHidd_PlanarBM }, {IID_Hidd_GC , &HiddGCAttrBase }, - {IID_Hidd_Compositing , &HiddCompositingAttrBase}, + {IID_Hidd_Compositor , &HiddCompositorAttrBase}, {NULL, NULL } }; @@ -216,18 +216,18 @@ int main(void) sd.IntelI2C = OOP_NewObject(NULL, CLID_HiddMeta, INTELI2C_tags); if (sd.IntelI2C) { - struct TagItem Compositing_tags[] = + struct TagItem Compositor_tags[] = { {aMeta_SuperID , (IPTR)CLID_Hidd}, - {aMeta_InterfaceDescr, (IPTR)Compositing_ifdescr}, - {aMeta_InstSize , sizeof(struct HIDDCompositingData)}, + {aMeta_InterfaceDescr, (IPTR)Compositor_ifdescr}, + {aMeta_InstSize , sizeof(struct HIDDCompositorData)}, {TAG_DONE, 0} }; sd.IntelI2C->UserData = &sd; - sd.compositingclass = OOP_NewObject(NULL, CLID_HiddMeta, Compositing_tags); - if (sd.compositingclass) + sd.compositorclass = OOP_NewObject(NULL, CLID_HiddMeta, Compositor_tags); + if (sd.compositorclass) { #ifndef GALLIUM_SIMULATION @@ -266,7 +266,7 @@ int main(void) */ return RETURN_OK; } - OOP_DisposeObject((OOP_Object *)sd.compositingclass); + OOP_DisposeObject((OOP_Object *)sd.compositorclass); } OOP_DisposeObject((OOP_Object *)sd.IntelI2C); } diff --git a/workbench/hidds/nouveau/compositor.h b/workbench/hidds/nouveau/compositor.h index aa8e0c1002..83f6553751 100644 --- a/workbench/hidds/nouveau/compositor.h +++ b/workbench/hidds/nouveau/compositor.h @@ -22,8 +22,8 @@ #endif /* Compositor interface */ -#define CLID_Hidd_Compositor "hidd.graphics.compositor" -#define IID_Hidd_Compositor "hidd.graphics.compositor" +#define CLID_Hidd_Compositor "hidd.gfx.compositor" +#define IID_Hidd_Compositor "hidd.gfx.compositor" #define HiddCompositorAttrBase __IHidd_Compositor diff --git a/workbench/libs/cgfx/scalepixelarray.c b/workbench/libs/cgfx/scalepixelarray.c index d4f5eb88b2..be414018b6 100644 --- a/workbench/libs/cgfx/scalepixelarray.c +++ b/workbench/libs/cgfx/scalepixelarray.c @@ -126,7 +126,7 @@ LONG internal_ScalePixelArray(APTR srcRect, UWORD SrcW, UWORD SrcH, UWORD SrcMod if (SrcW == 0 || SrcH == 0 || DestW == 0 || DestH == 0) return 0; - /* This is cybergraphx. We only work wih HIDD bitmaps */ + /* This is AROS Cybergraphx - We only work wih Gfx Hidd bitmaps */ if (!IS_HIDD_BM(RastPort->BitMap)) { @@ -134,7 +134,7 @@ LONG internal_ScalePixelArray(APTR srcRect, UWORD SrcW, UWORD SrcH, UWORD SrcMod return 0; } - /* Get graphics HIDD and a graphics context */ + /* Query the bitmaps Gfx Hidd, and create a suitable GC Object (graphics context) */ OOP_GetAttr(HIDD_BM_OBJ(RastPort->BitMap), aHidd_BitMap_GfxHidd, (IPTR *)&gfx_hidd); -- 2.11.4.GIT