Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
104f3275
Commit
104f3275
authored
15 years ago
by
Xiaohong Bao
Browse files
Options
Downloads
Patches
Plain Diff
add LLImageGL::create(...) back for server side use.
parent
77f56a3f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llrender/llimagegl.cpp
+25
-0
25 additions, 0 deletions
indra/llrender/llimagegl.cpp
indra/llrender/llimagegl.h
+8
-1
8 additions, 1 deletion
indra/llrender/llimagegl.h
with
33 additions
and
1 deletion
indra/llrender/llimagegl.cpp
+
25
−
0
View file @
104f3275
...
@@ -262,6 +262,31 @@ void LLImageGL::restoreGL()
...
@@ -262,6 +262,31 @@ void LLImageGL::restoreGL()
}
}
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
//for server side use only.
//static
BOOL
LLImageGL
::
create
(
LLPointer
<
LLImageGL
>&
dest
,
BOOL
usemipmaps
)
{
dest
=
new
LLImageGL
(
usemipmaps
);
return
TRUE
;
}
//for server side use only.
BOOL
LLImageGL
::
create
(
LLPointer
<
LLImageGL
>&
dest
,
U32
width
,
U32
height
,
U8
components
,
BOOL
usemipmaps
)
{
dest
=
new
LLImageGL
(
width
,
height
,
components
,
usemipmaps
);
return
TRUE
;
}
//for server side use only.
BOOL
LLImageGL
::
create
(
LLPointer
<
LLImageGL
>&
dest
,
const
LLImageRaw
*
imageraw
,
BOOL
usemipmaps
)
{
dest
=
new
LLImageGL
(
imageraw
,
usemipmaps
);
return
TRUE
;
}
//----------------------------------------------------------------------------
LLImageGL
::
LLImageGL
(
BOOL
usemipmaps
)
LLImageGL
::
LLImageGL
(
BOOL
usemipmaps
)
:
mSaveData
(
0
)
:
mSaveData
(
0
)
{
{
...
...
This diff is collapsed.
Click to expand it.
indra/llrender/llimagegl.h
+
8
−
1
View file @
104f3275
...
@@ -71,7 +71,14 @@ class LLImageGL : public LLRefCount
...
@@ -71,7 +71,14 @@ class LLImageGL : public LLRefCount
static
S32
updateBoundTexMem
(
const
S32
delta
);
static
S32
updateBoundTexMem
(
const
S32
delta
);
static
bool
checkSize
(
S32
width
,
S32
height
);
static
bool
checkSize
(
S32
width
,
S32
height
);
//for server side use only.
// Not currently necessary for LLImageGL, but required in some derived classes,
// so include for compatability
static
BOOL
create
(
LLPointer
<
LLImageGL
>&
dest
,
BOOL
usemipmaps
=
TRUE
);
static
BOOL
create
(
LLPointer
<
LLImageGL
>&
dest
,
U32
width
,
U32
height
,
U8
components
,
BOOL
usemipmaps
=
TRUE
);
static
BOOL
create
(
LLPointer
<
LLImageGL
>&
dest
,
const
LLImageRaw
*
imageraw
,
BOOL
usemipmaps
=
TRUE
);
public:
public:
LLImageGL
(
BOOL
usemipmaps
=
TRUE
);
LLImageGL
(
BOOL
usemipmaps
=
TRUE
);
LLImageGL
(
U32
width
,
U32
height
,
U8
components
,
BOOL
usemipmaps
=
TRUE
);
LLImageGL
(
U32
width
,
U32
height
,
U8
components
,
BOOL
usemipmaps
=
TRUE
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment