Skip to content
This repository was archived by the owner on Aug 27, 2022. It is now read-only.

Commit f4666a6

Browse files
jayathirthraojayathirthrao
committed
8254868: Remove additional logging added under JDK-8229819
1 parent a6f59f9 commit f4666a6

File tree

1 file changed

+3
-263
lines changed

1 file changed

+3
-263
lines changed

‎src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderQueue.m‎

Lines changed: 3 additions & 263 deletions
Original file line numberDiff line numberDiff line change
@@ -55,259 +55,6 @@
5555
extern void MTLGC_DestroyMTLGraphicsConfig(jlong pConfigInfo);
5656
extern void MTLSD_SwapBuffers(JNIEnv *env, jlong window);
5757

58-
// TODO : Debug logic added for opcode verification,
59-
// should be removed later.
60-
static char *getOpcodeString(jint opcode) {
61-
static char opName[30];
62-
switch (opcode) {
63-
case sun_java2d_pipe_BufferedOpCodes_DRAW_LINE:
64-
{
65-
strcpy(opName, "DRAW_LINE");
66-
}
67-
break;
68-
case sun_java2d_pipe_BufferedOpCodes_DRAW_RECT:
69-
{
70-
strcpy(opName, "DRAW_RECT");
71-
}
72-
break;
73-
case sun_java2d_pipe_BufferedOpCodes_DRAW_POLY:
74-
{
75-
strcpy(opName, "DRAW_POLY");
76-
}
77-
break;
78-
case sun_java2d_pipe_BufferedOpCodes_DRAW_PIXEL:
79-
{
80-
strcpy(opName, "DRAW_PIXEL");
81-
}
82-
break;
83-
case sun_java2d_pipe_BufferedOpCodes_DRAW_SCANLINES:
84-
{
85-
strcpy(opName, "DRAW_SCANLINES");
86-
}
87-
break;
88-
case sun_java2d_pipe_BufferedOpCodes_DRAW_PARALLELOGRAM:
89-
{
90-
strcpy(opName, "DRAW_PARALLELOGRAM");
91-
}
92-
break;
93-
case sun_java2d_pipe_BufferedOpCodes_DRAW_AAPARALLELOGRAM:
94-
{
95-
strcpy(opName, "DRAW_AAPARALLELOGRAM");
96-
}
97-
break;
98-
case sun_java2d_pipe_BufferedOpCodes_FILL_RECT:
99-
{
100-
strcpy(opName, "FILL_RECT");
101-
}
102-
break;
103-
case sun_java2d_pipe_BufferedOpCodes_FILL_SPANS:
104-
{
105-
strcpy(opName, "FILL_SPANS");
106-
}
107-
break;
108-
case sun_java2d_pipe_BufferedOpCodes_FILL_PARALLELOGRAM:
109-
{
110-
strcpy(opName, "FILL_PARALLELOGRAM");
111-
}
112-
break;
113-
case sun_java2d_pipe_BufferedOpCodes_FILL_AAPARALLELOGRAM:
114-
{
115-
strcpy(opName, "FILL_AAPARALLELOGRAM");
116-
}
117-
break;
118-
case sun_java2d_pipe_BufferedOpCodes_DRAW_GLYPH_LIST:
119-
{
120-
strcpy(opName, "DRAW_GLYPH_LIST");
121-
}
122-
break;
123-
case sun_java2d_pipe_BufferedOpCodes_COPY_AREA:
124-
{
125-
strcpy(opName, "COPY_AREA");
126-
}
127-
break;
128-
case sun_java2d_pipe_BufferedOpCodes_BLIT:
129-
{
130-
strcpy(opName, "BLIT");
131-
}
132-
break;
133-
case sun_java2d_pipe_BufferedOpCodes_SURFACE_TO_SW_BLIT:
134-
{
135-
strcpy(opName, "SURFACE_TO_SW_BLIT");
136-
}
137-
break;
138-
case sun_java2d_pipe_BufferedOpCodes_MASK_FILL:
139-
{
140-
strcpy(opName, "MASK_FILL");
141-
}
142-
break;
143-
case sun_java2d_pipe_BufferedOpCodes_MASK_BLIT:
144-
{
145-
146-
strcpy(opName, "MASK_BLIT");
147-
}
148-
break;
149-
case sun_java2d_pipe_BufferedOpCodes_SET_RECT_CLIP:
150-
{
151-
strcpy(opName, "SET_RECT_CLIP");
152-
}
153-
break;
154-
case sun_java2d_pipe_BufferedOpCodes_BEGIN_SHAPE_CLIP:
155-
{
156-
strcpy(opName, "BEGIN_SHAPE_CLIP");
157-
}
158-
break;
159-
case sun_java2d_pipe_BufferedOpCodes_SET_SHAPE_CLIP_SPANS:
160-
{
161-
strcpy(opName, "SET_SHAPE_CLIP_SPANS");
162-
}
163-
break;
164-
case sun_java2d_pipe_BufferedOpCodes_END_SHAPE_CLIP:
165-
{
166-
strcpy(opName, "END_SHAPE_CLIP");
167-
}
168-
break;
169-
case sun_java2d_pipe_BufferedOpCodes_RESET_CLIP:
170-
{
171-
strcpy(opName, "RESET_CLIP");
172-
}
173-
break;
174-
case sun_java2d_pipe_BufferedOpCodes_SET_ALPHA_COMPOSITE:
175-
{
176-
strcpy(opName, "SET_ALPHA_COMPOSITE");
177-
}
178-
break;
179-
case sun_java2d_pipe_BufferedOpCodes_SET_XOR_COMPOSITE:
180-
{
181-
strcpy(opName, "SET_XOR_COMPOSITE");
182-
}
183-
break;
184-
case sun_java2d_pipe_BufferedOpCodes_RESET_COMPOSITE:
185-
{
186-
strcpy(opName, "RESET_COMPOSITE");
187-
}
188-
break;
189-
case sun_java2d_pipe_BufferedOpCodes_SET_TRANSFORM:
190-
{
191-
strcpy(opName, "SET_TRANSFORM");
192-
}
193-
break;
194-
case sun_java2d_pipe_BufferedOpCodes_RESET_TRANSFORM:
195-
{
196-
strcpy(opName, "RESET_TRANSFORM");
197-
}
198-
break;
199-
case sun_java2d_pipe_BufferedOpCodes_SET_SURFACES:
200-
{
201-
202-
strcpy(opName, "SET_SURFACES");
203-
}
204-
break;
205-
case sun_java2d_pipe_BufferedOpCodes_SET_SCRATCH_SURFACE:
206-
{
207-
strcpy(opName, "SET_SCRATCH_SURFACE");
208-
}
209-
break;
210-
case sun_java2d_pipe_BufferedOpCodes_FLUSH_SURFACE:
211-
{
212-
strcpy(opName, "FLUSH_SURFACE");
213-
}
214-
break;
215-
case sun_java2d_pipe_BufferedOpCodes_DISPOSE_SURFACE:
216-
{
217-
strcpy(opName, "DISPOSE_SURFACE");
218-
}
219-
break;
220-
case sun_java2d_pipe_BufferedOpCodes_DISPOSE_CONFIG:
221-
{
222-
strcpy(opName, "DISPOSE_CONFIG");
223-
}
224-
break;
225-
case sun_java2d_pipe_BufferedOpCodes_INVALIDATE_CONTEXT:
226-
{
227-
strcpy(opName, "INVALIDATE_CONTEXT");
228-
}
229-
break;
230-
case sun_java2d_pipe_BufferedOpCodes_SYNC:
231-
{
232-
strcpy(opName, "SYNC");
233-
234-
}
235-
break;
236-
case sun_java2d_pipe_BufferedOpCodes_SWAP_BUFFERS:
237-
{
238-
strcpy(opName, "SWAP_BUFFERS");
239-
}
240-
break;
241-
case sun_java2d_pipe_BufferedOpCodes_NOOP:
242-
strcpy(opName, "NOOP");
243-
break;
244-
case sun_java2d_pipe_BufferedOpCodes_RESET_PAINT:
245-
{
246-
strcpy(opName, "RESET_PAINT");
247-
}
248-
break;
249-
case sun_java2d_pipe_BufferedOpCodes_SET_COLOR:
250-
{
251-
strcpy(opName, "SET_COLOR");
252-
}
253-
break;
254-
case sun_java2d_pipe_BufferedOpCodes_SET_GRADIENT_PAINT:
255-
{
256-
strcpy(opName, "SET_GRADIENT_PAINT");
257-
}
258-
break;
259-
case sun_java2d_pipe_BufferedOpCodes_SET_LINEAR_GRADIENT_PAINT:
260-
{
261-
strcpy(opName, "SET_LINEAR_GRADIENT_PAINT");
262-
}
263-
break;
264-
case sun_java2d_pipe_BufferedOpCodes_SET_RADIAL_GRADIENT_PAINT:
265-
{
266-
strcpy(opName, "SET_RADIAL_GRADIENT_PAINT");
267-
}
268-
break;
269-
case sun_java2d_pipe_BufferedOpCodes_SET_TEXTURE_PAINT:
270-
{
271-
strcpy(opName, "SET_TEXTURE_PAINT");
272-
}
273-
break;
274-
case sun_java2d_pipe_BufferedOpCodes_ENABLE_CONVOLVE_OP:
275-
{
276-
strcpy(opName, "ENABLE_CONVOLVE_OP");
277-
}
278-
break;
279-
case sun_java2d_pipe_BufferedOpCodes_DISABLE_CONVOLVE_OP:
280-
{
281-
strcpy(opName, "DISABLE_CONVOLVE_OP");
282-
}
283-
break;
284-
case sun_java2d_pipe_BufferedOpCodes_ENABLE_RESCALE_OP:
285-
{
286-
strcpy(opName, "ENABLE_RESCALE_OP");
287-
}
288-
break;
289-
case sun_java2d_pipe_BufferedOpCodes_DISABLE_RESCALE_OP:
290-
{
291-
strcpy(opName, "DISABLE_RESCALE_OP");
292-
}
293-
break;
294-
case sun_java2d_pipe_BufferedOpCodes_ENABLE_LOOKUP_OP:
295-
{
296-
strcpy(opName, "ENABLE_LOOKUP_OP");
297-
}
298-
break;
299-
case sun_java2d_pipe_BufferedOpCodes_DISABLE_LOOKUP_OP:
300-
{
301-
strcpy(opName, "DISABLE_LOOKUP_OP");
302-
}
303-
break;
304-
default:
305-
strcpy(opName, "UNKNOWN");
306-
break;
307-
}
308-
return opName;
309-
}
310-
31158
void MTLRenderQueue_CheckPreviousOp(jint op) {
31259

31360
if (mtlPreviousOp == op) {
@@ -374,19 +121,12 @@ void MTLRenderQueue_CheckPreviousOp(jint op) {
374121

375122
end = b + limit;
376123
@autoreleasepool {
377-
jboolean DEBUG_LOG = JNI_FALSE;
378124
while (b < end) {
379125
jint opcode = NEXT_INT(b);
380126

381-
if (DEBUG_LOG) {
382-
J2dTraceLn2(J2D_TRACE_ERROR,
383-
"MTLRenderQueue_flushBuffer: opcode_name = %s, rem=%d",
384-
getOpcodeString(opcode), (end-b));
385-
} else {
386-
J2dTraceLn2(J2D_TRACE_VERBOSE,
387-
"MTLRenderQueue_flushBuffer: opcode=%d, rem=%d",
388-
opcode, (end-b));
389-
}
127+
J2dTraceLn2(J2D_TRACE_VERBOSE,
128+
"MTLRenderQueue_flushBuffer: opcode=%d, rem=%d",
129+
opcode, (end-b));
390130

391131
switch (opcode) {
392132

0 commit comments

Comments
 (0)